compiles again on win32, trashed mhash
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@338 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
TTimo
@@ -36,8 +36,6 @@ several games based on the Quake III Arena engine, in the form of "Q3Map2."
|
||||
/* dependencies */
|
||||
#include "q3map2.h"
|
||||
|
||||
|
||||
|
||||
/*
|
||||
Random()
|
||||
returns a pseudorandom number between 0 and 1
|
||||
@@ -62,33 +60,19 @@ static void ExitQ3Map( void )
|
||||
free( mapDrawSurfs );
|
||||
}
|
||||
|
||||
static int MD4BlockChecksum( void * buffer, int length ) {
|
||||
unsigned char digest[16];
|
||||
int checksum;
|
||||
|
||||
|
||||
/*
|
||||
MD4BlockChecksum()
|
||||
calculates an md4 checksum for a block of data
|
||||
*/
|
||||
|
||||
static int MD4BlockChecksum( void *buffer, int length )
|
||||
{
|
||||
MHASH mh;
|
||||
int digest[ 4 ], checksum;
|
||||
|
||||
|
||||
/* make md4 hash */
|
||||
mh = mhash_init( MHASH_MD4 );
|
||||
if( !mh )
|
||||
Error( "Unable to initialize MD4 hash context" );
|
||||
mhash( mh, buffer, length );
|
||||
mhash_deinit( mh, digest );
|
||||
|
||||
/* xor the bits and return */
|
||||
checksum = digest[ 0 ] ^ digest[ 1 ] ^ digest[ 2 ] ^ digest[ 3 ];
|
||||
md4_get_digest( buffer, length, digest );
|
||||
/* I suppose it has to be done that way for legacy reasons? */
|
||||
checksum = digest[0] & ( digest[1] << 8 ) & ( digest[2] << 16 ) & ( digest[3] << 24 );
|
||||
checksum ^= digest[4] & ( digest[5] << 8 ) & ( digest[6] << 16 ) & ( digest[7] << 24 );
|
||||
checksum ^= digest[8] & ( digest[9] << 8 ) & ( digest[10] << 16 ) & ( digest[11] << 24 );
|
||||
checksum ^= digest[12] & ( digest[13] << 8 ) & ( digest[14] << 16 ) & ( digest[15] << 24 );
|
||||
return checksum;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
FixAAS()
|
||||
resets an aas checksum to match the given BSP
|
||||
|
||||
@@ -68,6 +68,7 @@ dependencies
|
||||
#include "cmdlib.h"
|
||||
#include "mathlib.h"
|
||||
#include "md5lib.h"
|
||||
#include "md4lib.h"
|
||||
#include "ddslib.h"
|
||||
|
||||
#include "picomodel.h"
|
||||
@@ -81,7 +82,7 @@ dependencies
|
||||
#include "png.h"
|
||||
|
||||
/* mhash library must be installed locally or system wide - http://mhash.sourceforge.net/ */
|
||||
#include "mhash.h"
|
||||
//#include "mhash.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\..\mhash-0.9.9\include";"$(SolutionDir)\..\jpeg-6b";"$(SolutionDir)\tools\quake3\common";"$(SolutionDir)\include";"$(SolutionDir)\libs";"$(SolutionDir)\..\STLPort\stlport";"$(SolutionDir)\..\gtk2\include";"$(SolutionDir)\..\gtk2\include\glib-2.0";"$(SolutionDir)\..\gtk2\lib\glib-2.0\include";"$(SolutionDir)\..\libxml2\include""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\..\jpeg-6b";"$(SolutionDir)\tools\quake3\common";"$(SolutionDir)\include";"$(SolutionDir)\libs";"$(SolutionDir)\..\STLPort\stlport";"$(SolutionDir)\..\gtk2\include";"$(SolutionDir)\..\gtk2\include\glib-2.0";"$(SolutionDir)\..\gtk2\lib\glib-2.0\include";"$(SolutionDir)\..\libxml2\include""
|
||||
PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
|
||||
MinimalRebuild="true"
|
||||
BasicRuntimeChecks="3"
|
||||
@@ -62,8 +62,8 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libmhash.lib md5lib.lib ddslib.lib l_net.lib mathlib.lib picomodel.lib libjpeg.lib libxml2.lib libpng.lib glib-2.0.lib gobject-2.0.lib Wsock32.lib"
|
||||
AdditionalLibraryDirectories=""$(SolutionDir)\..\mhash-0.9.9\win32\libmhash\Release";"$(SolutionDir)\..\jpeg-6b";"$(SolutionDir)\..\libxml2\lib";"$(SolutionDir)\..\gtk2\lib";"$(SolutionDir)\build\$(ConfigurationName)\libs""
|
||||
AdditionalDependencies="md5lib.lib ddslib.lib l_net.lib mathlib.lib picomodel.lib libjpeg.lib libxml2.lib libpng.lib glib-2.0.lib gobject-2.0.lib Wsock32.lib"
|
||||
AdditionalLibraryDirectories=""$(SolutionDir)\..\jpeg-6b";"$(SolutionDir)\..\libxml2\lib";"$(SolutionDir)\..\gtk2\lib";"$(SolutionDir)\build\$(ConfigurationName)\libs""
|
||||
GenerateDebugInformation="true"
|
||||
StackReserveSize="2097152"
|
||||
StackCommitSize="2097152"
|
||||
@@ -119,7 +119,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\..\mhash-0.9.9\include";"$(SolutionDir)\..\jpeg-6b";"$(SolutionDir)\tools\quake3\common";"$(SolutionDir)\include";"$(SolutionDir)\libs";"$(SolutionDir)\..\STLPort\stlport";"$(SolutionDir)\..\gtk2\include";"$(SolutionDir)\..\gtk2\include\glib-2.0";"$(SolutionDir)\..\gtk2\lib\glib-2.0\include";"$(SolutionDir)\..\libxml2\include""
|
||||
AdditionalIncludeDirectories=""$(SolutionDir)\..\jpeg-6b";"$(SolutionDir)\tools\quake3\common";"$(SolutionDir)\include";"$(SolutionDir)\libs";"$(SolutionDir)\..\STLPort\stlport";"$(SolutionDir)\..\gtk2\include";"$(SolutionDir)\..\gtk2\include\glib-2.0";"$(SolutionDir)\..\gtk2\lib\glib-2.0\include";"$(SolutionDir)\..\libxml2\include""
|
||||
PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
|
||||
RuntimeLibrary="2"
|
||||
WarningLevel="3"
|
||||
@@ -138,8 +138,8 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="libmhash.lib md5lib.lib ddslib.lib l_net.lib mathlib.lib picomodel.lib libjpeg.lib libxml2.lib libpng.lib glib-2.0.lib gobject-2.0.lib Wsock32.lib"
|
||||
AdditionalLibraryDirectories=""$(SolutionDir)\..\mhash-0.9.9\win32\libmhash\Release";"$(SolutionDir)\..\jpeg-6b";"$(SolutionDir)\..\libxml2\lib";"$(SolutionDir)\..\gtk2\lib";"$(SolutionDir)\build\$(ConfigurationName)\libs""
|
||||
AdditionalDependencies="md5lib.lib ddslib.lib l_net.lib mathlib.lib picomodel.lib libjpeg.lib libxml2.lib libpng.lib glib-2.0.lib gobject-2.0.lib Wsock32.lib"
|
||||
AdditionalLibraryDirectories=""$(SolutionDir)\..\jpeg-6b";"$(SolutionDir)\..\libxml2\lib";"$(SolutionDir)\..\gtk2\lib";"$(SolutionDir)\build\$(ConfigurationName)\libs""
|
||||
GenerateDebugInformation="true"
|
||||
StackReserveSize="2097152"
|
||||
StackCommitSize="2097152"
|
||||
|
||||
@@ -408,7 +408,7 @@ shaderInfo_t *CustomShader( shaderInfo_t *si, char *find, char *replace )
|
||||
char shader[ MAX_QPATH ];
|
||||
char *s;
|
||||
int loc;
|
||||
MHASH mh;
|
||||
md5_state_t mh;
|
||||
byte digest[ 16 ];
|
||||
char *srcShaderText, temp[ 8192 ], shaderText[ 8192 ]; /* ydnar: fixme (make this bigger?) */
|
||||
|
||||
@@ -530,11 +530,9 @@ shaderInfo_t *CustomShader( shaderInfo_t *si, char *find, char *replace )
|
||||
}
|
||||
|
||||
/* 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 );
|
||||
md5_init( &mh );
|
||||
md5_append( &mh, shaderText, strlen( shaderText ) );
|
||||
md5_finish( &mh, 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 +568,7 @@ adds a vertexremapshader key/value pair to worldspawn
|
||||
|
||||
void EmitVertexRemapShader( char *from, char *to )
|
||||
{
|
||||
MHASH mh;
|
||||
md5_state_t mh;
|
||||
byte digest[ 16 ];
|
||||
char key[ 64 ], value[ 256 ];
|
||||
|
||||
@@ -584,11 +582,9 @@ void EmitVertexRemapShader( char *from, char *to )
|
||||
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 );
|
||||
md5_init( &mh );
|
||||
md5_append( &mh, value, strlen( value ) );
|
||||
md5_finish( &mh, 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) */
|
||||
|
||||
Reference in New Issue
Block a user