got rid of libmhash dependency

[xonotic/netradiant.git] / tools / quake3 / q3map2 / shaders.c

diff --git a/tools/quake3/q3map2/shaders.c b/tools/quake3/q3map2/shaders.c
index cd26958502c0802663b8b7bce324211727fcccc1..a0d5d79d96a62cef12fcdd620e103663ccafc7e8 100644 (file)
--- a/tools/quake3/q3map2/shaders.c
+++ b/tools/quake3/q3map2/shaders.c
@@ -408,7 +408,6 @@ shaderInfo_t *CustomShader( shaderInfo_t *si, char *find, char *replace )
        char                    shader[ MAX_QPATH ];
        char                    *s;
        int                             loc;
-       MHASH                   mh;
        byte                    digest[ 16 ];
        char                    *srcShaderText, temp[ 8192 ], shaderText[ 8192 ];       /* ydnar: fixme (make this bigger?) */
        
@@ -529,12 +528,8 @@ shaderInfo_t *CustomShader( shaderInfo_t *si, char *find, char *replace )
                strcat( shaderText, &srcShaderText[ loc + strlen( find ) ] );
        }
        
-       /* make md5 hash of the shader text */
-       mh = mhash_init( MHASH_MD5 );
-       if( !mh )
-               Error( "Unable to initialize MD5 hash context" );
-       mhash( mh, shaderText, strlen( shaderText ) );
-       mhash_deinit( mh, digest );
+       /* make md4 hash of the shader text */
+       Com_BlockFullChecksum(shaderText, strlen(shaderText), digest);
        
        /* mangle hash into a shader name */
        sprintf( shader, "%s/%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X", mapName,
@@ -570,7 +565,6 @@ adds a vertexremapshader key/value pair to worldspawn
 
 void EmitVertexRemapShader( char *from, char *to )
 {
-       MHASH                   mh;
        byte                    digest[ 16 ];
        char                    key[ 64 ], value[ 256 ];
        
@@ -583,12 +577,8 @@ void EmitVertexRemapShader( char *from, char *to )
        /* build value */
        sprintf( value, "%s;%s", from, to );
        
-       /* make md5 hash */
-       mh = mhash_init( MHASH_MD5 );
-       if( !mh )
-               Error( "Unable to initialize MD5 hash context" );
-       mhash( mh, value, strlen( value ) );
-       mhash_deinit( mh, digest );
+       /* make md4 hash */
+       Com_BlockFullChecksum(value, strlen(value), digest);
 
        /* make key (this is annoying, as vertexremapshader is precisely 17 characters,
           which is one too long, so we leave off the last byte of the md5 digest) */