FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix saverestore on LP64

This commit is contained in:
mittorn 2017-07-08 20:26:21 +00:00
parent e099224bc5
commit 3bce17e3a0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/saverestore.h
View File

@ -59,7 +59,7 @@ public:
void WriteVector( const char *pname, const float *value, int count ); // Save a vector void WriteVector( const char *pname, const float *value, int count ); // Save a vector
void WritePositionVector( const char *pname, const Vector &value ); // Offset for landmark if necessary void WritePositionVector( const char *pname, const Vector &value ); // Offset for landmark if necessary
void WritePositionVector( const char *pname, const float *value, int count ); // array of pos vectors void WritePositionVector( const char *pname, const float *value, int count ); // array of pos vectors
void WriteFunction( const char *pname, const int *value, int count ); // Save a function pointer void WriteFunction( const char *pname, void **value, int count ); // Save a function pointer
int WriteEntVars( const char *pname, entvars_t *pev ); // Save entvars_t (entvars_t) int WriteEntVars( const char *pname, entvars_t *pev ); // Save entvars_t (entvars_t)
int WriteFields( const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount ); int WriteFields( const char *pname, void *pBaseData, TYPEDESCRIPTION *pFields, int fieldCount );

6
dlls/util.cpp
View File

@ -1886,7 +1886,7 @@ void CSave::WritePositionVector( const char *pname, const float *value, int coun
} }
} }
void CSave::WriteFunction( const char *pname, const int *data, int count ) void CSave::WriteFunction( const char *pname, void **data, int count )
{ {
const char *functionName; const char *functionName;
@ -1894,7 +1894,7 @@ void CSave::WriteFunction( const char *pname, const int *data, int count )
if( functionName ) if( functionName )
BufferField( pname, strlen( functionName ) + 1, functionName ); BufferField( pname, strlen( functionName ) + 1, functionName );
else else
ALERT( at_error, "Invalid function pointer in entity!" ); ALERT( at_error, "Invalid function pointer in entity!\n" );
} }
void EntvarsKeyvalue( entvars_t *pev, KeyValueData *pkvd ) void EntvarsKeyvalue( entvars_t *pev, KeyValueData *pkvd )
@ -2042,7 +2042,7 @@ int CSave::WriteFields( const char *pname, void *pBaseData, TYPEDESCRIPTION *pFi
WriteInt( pTest->fieldName, (int *)(char *)pOutputData, pTest->fieldSize ); WriteInt( pTest->fieldName, (int *)(char *)pOutputData, pTest->fieldSize );
break; break;
case FIELD_FUNCTION: case FIELD_FUNCTION:
WriteFunction( pTest->fieldName, (int *)pOutputData, pTest->fieldSize ); WriteFunction( pTest->fieldName, (void **)pOutputData, pTest->fieldSize );
break; break;
default: default:
ALERT( at_error, "Bad field type\n" ); ALERT( at_error, "Bad field type\n" );

4
engine/eiface.h
View File

@ -171,8 +171,8 @@ typedef struct enginefuncs_s
int (*pfnRegUserMsg)( const char *pszName, int iSize ); int (*pfnRegUserMsg)( const char *pszName, int iSize );
void (*pfnAnimationAutomove)( const edict_t* pEdict, float flTime ); void (*pfnAnimationAutomove)( const edict_t* pEdict, float flTime );
void (*pfnGetBonePosition)( const edict_t* pEdict, int iBone, float *rgflOrigin, float *rgflAngles ); void (*pfnGetBonePosition)( const edict_t* pEdict, int iBone, float *rgflOrigin, float *rgflAngles );
unsigned long (*pfnFunctionFromName)( const char *pName ); void* (*pfnFunctionFromName)( const char *pName );
const char *(*pfnNameForFunction)( unsigned long function ); const char *(*pfnNameForFunction)( void *function );
void (*pfnClientPrintf)( edict_t* pEdict, PRINT_TYPE ptype, const char *szMsg ); // JOHN: engine callbacks so game DLL can print messages to individual clients void (*pfnClientPrintf)( edict_t* pEdict, PRINT_TYPE ptype, const char *szMsg ); // JOHN: engine callbacks so game DLL can print messages to individual clients
void (*pfnServerPrint)( const char *szMsg ); void (*pfnServerPrint)( const char *szMsg );
const char *(*pfnCmd_Args)( void ); // these 3 added const char *(*pfnCmd_Args)( void ); // these 3 added