From 76fb0c6d6fab2e904ef09b8adb7ad6015ad3cbe4 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Sun, 21 Apr 2013 23:08:41 +1000 Subject: [PATCH] chids in savegames are 32 bits on disk so don't use long --- code/game/Q3_Interface.cpp | 4 ++-- code/game/Q3_Interface.h | 6 +++--- code/game/g_savegame.cpp | 8 ++++---- code/icarus/IcarusInterface.h | 6 +++--- code/qcommon/cm_load.cpp | 4 ++-- code/qcommon/cm_load_xbox.cpp | 4 ++-- code/server/server.h | 6 +++--- code/server/sv_savegame.cpp | 20 ++++++++++---------- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/code/game/Q3_Interface.cpp b/code/game/Q3_Interface.cpp index a22edef..704e802 100644 --- a/code/game/Q3_Interface.cpp +++ b/code/game/Q3_Interface.cpp @@ -11058,12 +11058,12 @@ void CQuake3GameInterface::FreeVariable( const char *name ) } //Save / Load functions -int CQuake3GameInterface::WriteSaveData( unsigned long chid, void *data, int length ) +int CQuake3GameInterface::WriteSaveData( unsigned int chid, void *data, int length ) { return gi.AppendToSaveGame( chid, data, length ); } -int CQuake3GameInterface::ReadSaveData( unsigned long chid, void *address, int length, void **addressptr ) +int CQuake3GameInterface::ReadSaveData( unsigned int chid, void *address, int length, void **addressptr ) { return gi.ReadFromSaveGame( chid, address, length, addressptr ); } diff --git a/code/game/Q3_Interface.h b/code/game/Q3_Interface.h index da1beca..026f23f 100644 --- a/code/game/Q3_Interface.h +++ b/code/game/Q3_Interface.h @@ -673,8 +673,8 @@ public: void FreeVariable( const char *name ); //Save / Load functions - int WriteSaveData( unsigned long chid, void *data, int length ); - int ReadSaveData( unsigned long chid, void *address, int length, void **addressptr = NULL ); + int WriteSaveData( unsigned int chid, void *data, int length ); + int ReadSaveData( unsigned int chid, void *address, int length, void **addressptr = NULL ); int LinkGame( int entID, int icarusID ); // Access functions @@ -701,4 +701,4 @@ inline CQuake3GameInterface *Quake3Game() { return (CQuake3GameInterface *)IGame /* END Quake 3 Game Interface END */ ////////////////////////////////////////////////////////////////////////// -#endif //__Q3_INTERFACE__ \ No newline at end of file +#endif //__Q3_INTERFACE__ diff --git a/code/game/g_savegame.cpp b/code/game/g_savegame.cpp index e4c8f4f..af8ffd8 100644 --- a/code/game/g_savegame.cpp +++ b/code/game/g_savegame.cpp @@ -481,7 +481,7 @@ static void EnumerateField(const save_field_t *pField, const byte *pbBase) } } -static void EnumerateFields(const save_field_t *pFields, const byte *pbData, unsigned long ulChid, int iLen) +static void EnumerateFields(const save_field_t *pFields, const byte *pbData, unsigned int ulChid, int iLen) { strList = new list; @@ -622,11 +622,11 @@ static void EvaluateField(const save_field_t *pField, byte *pbBase, byte *pbOrig // copy of function in sv_savegame -static LPCSTR SG_GetChidText(unsigned long chid) +static LPCSTR SG_GetChidText(unsigned int chid) { static char chidtext[5]; - *(unsigned long *)chidtext = BigLong(chid); + *(unsigned int *)chidtext = BigLong(chid); chidtext[4] = 0; return chidtext; @@ -705,7 +705,7 @@ static void SG_ConvertRetailSaberinfoToNewSaberinfo( void *sabData, saberInfo_t } } -static void EvaluateFields(const save_field_t *pFields, byte *pbData, byte *pbOriginalRefData, unsigned long ulChid, int iSize, qboolean bOkToSizeMisMatch) +static void EvaluateFields(const save_field_t *pFields, byte *pbData, byte *pbOriginalRefData, unsigned int ulChid, int iSize, qboolean bOkToSizeMisMatch) { int iReadSize = gi.ReadFromSaveGame(ulChid, pbData, bOkToSizeMisMatch?0:iSize); diff --git a/code/icarus/IcarusInterface.h b/code/icarus/IcarusInterface.h index 725350a..969fc03 100644 --- a/code/icarus/IcarusInterface.h +++ b/code/icarus/IcarusInterface.h @@ -120,8 +120,8 @@ public: // Save / Load functions - virtual int WriteSaveData( unsigned long chid, void *data, int length ) = 0; - virtual int ReadSaveData( unsigned long chid, void *address, int length, void **addressptr = NULL ) = 0; + virtual int WriteSaveData( unsigned int chid, void *data, int length ) = 0; + virtual int ReadSaveData( unsigned int chid, void *address, int length, void **addressptr = NULL ) = 0; virtual int LinkGame( int gameID, int icarusID ) = 0; // Access functions @@ -140,4 +140,4 @@ public: virtual void PrecacheFromSet(const char* setname, const char* filename) = 0; }; -#endif \ No newline at end of file +#endif diff --git a/code/qcommon/cm_load.cpp b/code/qcommon/cm_load.cpp index e077ed9..dbac850 100644 --- a/code/qcommon/cm_load.cpp +++ b/code/qcommon/cm_load.cpp @@ -1274,8 +1274,8 @@ Writes the portal state to a savegame file =================== */ // -qboolean SG_Append(unsigned long chid, const void *data, int length); -int SG_Read(unsigned long chid, void *pvAddress, int iLength, void **ppvAddressPtr = NULL); +qboolean SG_Append(unsigned int chid, const void *data, int length); +int SG_Read(unsigned int chid, void *pvAddress, int iLength, void **ppvAddressPtr = NULL); void CM_WritePortalState () { diff --git a/code/qcommon/cm_load_xbox.cpp b/code/qcommon/cm_load_xbox.cpp index f171b20..699bf99 100644 --- a/code/qcommon/cm_load_xbox.cpp +++ b/code/qcommon/cm_load_xbox.cpp @@ -1224,8 +1224,8 @@ Writes the portal state to a savegame file */ // having to proto this stuff again here is crap, but wtf?... // -qboolean SG_Append(unsigned long chid, const void *data, int length); -int SG_Read(unsigned long chid, void *pvAddress, int iLength, void **ppvAddressPtr = NULL); +qboolean SG_Append(unsigned int chid, const void *data, int length); +int SG_Read(unsigned int chid, void *pvAddress, int iLength, void **ppvAddressPtr = NULL); void CM_WritePortalState () { diff --git a/code/server/server.h b/code/server/server.h index e683e79..a021cdc 100644 --- a/code/server/server.h +++ b/code/server/server.h @@ -299,9 +299,9 @@ qboolean SV_TryLoadTransition( const char *mapname ); qboolean SG_WriteSavegame(const char *psPathlessBaseName, qboolean qbAutosave); qboolean SG_ReadSavegame(const char *psPathlessBaseName); void SG_WipeSavegame(const char *psPathlessBaseName); -qboolean SG_Append(unsigned long chid, const void *data, int length); -int SG_Read (unsigned long chid, void *pvAddress, int iLength, void **ppvAddressPtr = NULL); -int SG_ReadOptional (unsigned long chid, void *pvAddress, int iLength, void **ppvAddressPtr = NULL); +qboolean SG_Append(unsigned int chid, const void *data, int length); +int SG_Read (unsigned int chid, void *pvAddress, int iLength, void **ppvAddressPtr = NULL); +int SG_ReadOptional (unsigned int chid, void *pvAddress, int iLength, void **ppvAddressPtr = NULL); void SG_Shutdown(); void SG_TestSave(void); // diff --git a/code/server/sv_savegame.cpp b/code/server/sv_savegame.cpp index 40827e6..b3af2fa 100644 --- a/code/server/sv_savegame.cpp +++ b/code/server/sv_savegame.cpp @@ -116,15 +116,15 @@ public: } }; -typedef map CChidInfo_t; +typedef map CChidInfo_t; CChidInfo_t save_info; #endif -LPCSTR SG_GetChidText(unsigned long chid) +LPCSTR SG_GetChidText(unsigned int chid) { static char chidtext[5]; - *(unsigned long *)chidtext = BigLong(chid); + *(unsigned int *)chidtext = BigLong(chid); chidtext[4] = 0; return chidtext; @@ -1573,16 +1573,16 @@ int SG_Write(const void * chid, const int bytesize, fileHandle_t fhSaveGame) -qboolean SG_Append(unsigned long chid, const void *pvData, int iLength) +qboolean SG_Append(unsigned int chid, const void *pvData, int iLength) { unsigned int uiCksum; unsigned int uiSaved; #ifdef _DEBUG int i; - unsigned long *pTest; + unsigned int *pTest; - pTest = (unsigned long *) pvData; + pTest = (unsigned int *) pvData; for (i=0; i