diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 7e0ad6ce3..e4e430080 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1676,26 +1676,29 @@ static boolean SV_SendServerConfig(INT32 node) static void SV_SendSaveGame(INT32 node, boolean resending) { size_t length, compressedlen; - savebuffer_t save = {0}; + savebuffer_t save; UINT8 *compressedsave; UINT8 *buffertosend; // first save it in a malloced buffer - if (P_SaveBufferAlloc(&save, NETSAVEGAMESIZE) == false) + save.size = NETSAVEGAMESIZE; + save.buffer = (UINT8 *)malloc(save.size); + if (!save.buffer) { CONS_Alert(CONS_ERROR, M_GetText("No more free memory for savegame\n")); return; } // Leave room for the uncompressed length. - save.p += sizeof(UINT32); + save.p = save.buffer + sizeof(UINT32); + save.end = save.buffer + save.size; P_SaveNetGame(&save, resending); length = save.p - save.buffer; if (length > NETSAVEGAMESIZE) { - P_SaveBufferFree(&save); + free(save.buffer); I_Error("Savegame buffer overrun"); } @@ -1712,7 +1715,7 @@ static void SV_SendSaveGame(INT32 node, boolean resending) if ((compressedlen = lzf_compress(save.buffer + sizeof(UINT32), length - sizeof(UINT32), compressedsave + sizeof(UINT32), length - sizeof(UINT32) - 1))) { // Compressing succeeded; send compressed data - P_SaveBufferFree(&save); + free(save.buffer); // State that we're compressed. buffertosend = compressedsave; @@ -1743,7 +1746,7 @@ static consvar_t cv_dumpconsistency = {"dumpconsistency", "Off", CV_NETVAR, CV_O static void SV_SavedGame(void) { size_t length; - savebuffer_t save = {0}; + savebuffer_t save; char tmpsave[264]; if (!cv_dumpconsistency.value) @@ -1752,19 +1755,24 @@ static void SV_SavedGame(void) sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home); // first save it in a malloced buffer - if (P_SaveBufferAlloc(&save, NETSAVEGAMESIZE) == false) + save.size = NETSAVEGAMESIZE; + save.p = save.buffer = (UINT8 *)malloc(save.size); + if (!save.p) { CONS_Alert(CONS_ERROR, M_GetText("No more free memory for savegame\n")); - P_SaveBufferFree(&save); + free(save.buffer); + save.p = NULL; return; } + save.end = save.buffer + save.size; + P_SaveNetGame(&save); length = save.p - save.buffer; if (length > NETSAVEGAMESIZE) { - P_SaveBufferFree(&save); + free(save.buffer); I_Error("Savegame buffer overrun"); } @@ -1772,7 +1780,7 @@ static void SV_SavedGame(void) if (!FIL_WriteFile(tmpsave, save.buffer, length)) CONS_Printf(M_GetText("Didn't save %s for netgame"), tmpsave); - P_SaveBufferFree(&save); + free(save.buffer); } #undef TMPSAVENAME @@ -1781,20 +1789,24 @@ static void SV_SavedGame(void) static void CL_LoadReceivedSavegame(boolean reloading) { - savebuffer_t save = {0}; + savebuffer_t save; size_t length, decompressedlen; char tmpsave[264]; sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home); - if (P_SaveBufferFromFile(&save, tmpsave) == false) + length = FIL_ReadFile(tmpsave, &save.buffer); + + CONS_Printf(M_GetText("Loading savegame length %s\n"), sizeu1(length)); + if (!length) { I_Error("Can't read savegame sent"); return; } - length = save.size; - CONS_Printf(M_GetText("Loading savegame length %s\n"), sizeu1(length)); + save.p = save.buffer; + save.size = length; + save.end = save.buffer + save.size; // Decompress saved game if necessary. decompressedlen = READUINT32(save.p); @@ -1804,9 +1816,11 @@ static void CL_LoadReceivedSavegame(boolean reloading) UINT8 *decompressedbuffer = Z_Malloc(decompressedlen, PU_STATIC, NULL); lzf_decompress(save.p, length - sizeof(UINT32), decompressedbuffer, decompressedlen); + Z_Free(save.buffer); - P_SaveBufferFree(&save); - P_SaveBufferFromExisting(&save, decompressedbuffer, decompressedlen); + save.p = save.buffer = decompressedbuffer; + save.size = decompressedlen; + save.end = save.buffer + decompressedlen; } paused = false; @@ -1835,8 +1849,8 @@ static void CL_LoadReceivedSavegame(boolean reloading) } // done - P_SaveBufferFree(&save); - + Z_Free(save.buffer); + save.p = NULL; if (unlink(tmpsave) == -1) CONS_Alert(CONS_ERROR, M_GetText("Can't delete %s\n"), tmpsave); consistancy[gametic%TICQUEUE] = Consistancy(); @@ -6713,7 +6727,7 @@ void CL_ClearRewinds(void) rewind_t *CL_SaveRewindPoint(size_t demopos) { - savebuffer_t save = {0}; + savebuffer_t save; rewind_t *rewind; if (rewindhead && rewindhead->leveltime + REWIND_POINT_INTERVAL > leveltime) @@ -6723,7 +6737,9 @@ rewind_t *CL_SaveRewindPoint(size_t demopos) if (!rewind) return NULL; - P_SaveBufferFromExisting(&save, rewind->savebuffer, NETSAVEGAMESIZE); + save.buffer = save.p = rewind->savebuffer; + save.size = NETSAVEGAMESIZE; + save.end = save.buffer + save.size; P_SaveNetGame(&save, false); rewind->leveltime = leveltime; @@ -6736,7 +6752,7 @@ rewind_t *CL_SaveRewindPoint(size_t demopos) rewind_t *CL_RewindToTime(tic_t time) { - savebuffer_t save = {0}; + savebuffer_t save; rewind_t *rewind; while (rewindhead && rewindhead->leveltime > time) @@ -6749,7 +6765,9 @@ rewind_t *CL_RewindToTime(tic_t time) if (!rewindhead) return NULL; - P_SaveBufferFromExisting(&save, rewindhead->savebuffer, NETSAVEGAMESIZE); + save.buffer = save.p = rewindhead->savebuffer; + save.size = NETSAVEGAMESIZE; + save.end = save.buffer + save.size; P_LoadNetGame(&save, false); wipegamestate = gamestate; // No fading back in! diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 6f5520448..224165751 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -5228,7 +5228,7 @@ static void Command_Togglemodified_f(void) static void Command_Archivetest_f(void) { - savebuffer_t save = {0}; + savebuffer_t save; UINT32 i, wrote; thinker_t *th; if (gamestate != GS_LEVEL) @@ -5244,11 +5244,9 @@ static void Command_Archivetest_f(void) ((mobj_t *)th)->mobjnum = i++; // allocate buffer - if (P_SaveBufferAlloc(&save, 1024) == false) - { - CONS_Printf("Unable to allocate buffer.\n"); - return; - } + save.size = 1024; + save.buffer = save.p = ZZ_Alloc(save.size); + save.end = save.buffer + save.size; // test archive CONS_Printf("LUA_Archive...\n"); @@ -5269,7 +5267,7 @@ static void Command_Archivetest_f(void) CONS_Printf("Savegame corrupted. (write %u, read %u)\n", wrote, (UINT32)(save.p - save.buffer)); // free buffer - P_SaveBufferFree(&save); + Z_Free(save.buffer); CONS_Printf("Done. No crash.\n"); } #endif diff --git a/src/g_game.c b/src/g_game.c index 0a453ef5f..bfe40cf13 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -292,7 +292,7 @@ UINT32 timesBeatenWithEmeralds; //@TODO put these all in a struct for namespacing purposes? static char demoname[128]; -static savebuffer_t demobuf = {0}; +savebuffer_t demobuf; static UINT8 *demotime_p, *demoinfo_p; static UINT8 demoflags; static boolean demosynced = true; // console warning message @@ -3697,10 +3697,11 @@ void G_LoadGameSettings(void) // Loads the main data file, which stores information such as emblems found, etc. void G_LoadGameData(void) { + size_t length; INT32 i, j; UINT8 modded = false; UINT8 rtemp; - savebuffer_t save = {0}; + savebuffer_t save; //For records tic_t rectime; @@ -3722,9 +3723,12 @@ void G_LoadGameData(void) if (M_CheckParm("-resetdata")) return; // Don't load (essentially, reset). - if (P_SaveBufferFromFile(&save, va(pandf, srb2home, gamedatafilename)) == false) // Aw, no game data. Their loss! + length = FIL_ReadFile(va(pandf, srb2home, gamedatafilename), &save.buffer); + if (!length) // Aw, no game data. Their loss! return; + save.p = save.buffer; + // Version check if (READUINT32(save.p) != 0xFCAFE211) { @@ -3732,8 +3736,9 @@ void G_LoadGameData(void) if (strcmp(srb2home,".")) gdfolder = srb2home; - P_SaveBufferFree(&save); - I_Error("Game data is not for SRB2Kart.\nDelete %s(maybe in %s) and try again.", gamedatafilename, gdfolder); + Z_Free(save.buffer); + save.p = NULL; + I_Error("Game data is from another version of SRB2.\nDelete %s(maybe in %s) and try again.", gamedatafilename, gdfolder); } totalplaytime = READUINT32(save.p); @@ -3800,7 +3805,8 @@ void G_LoadGameData(void) } // done - P_SaveBufferFree(&save); + Z_Free(save.buffer); + save.p = NULL; // Silent update unlockables in case they're out of sync with conditions M_SilentUpdateUnlockablesAndEmblems(); @@ -3814,7 +3820,8 @@ void G_LoadGameData(void) if (strcmp(srb2home,".")) gdfolder = srb2home; - P_SaveBufferFree(&save); + Z_Free(save.buffer); + save.p = NULL; I_Error("Corrupt game data file.\nDelete %s(maybe in %s) and try again.", gamedatafilename, gdfolder); } @@ -3827,20 +3834,24 @@ void G_SaveGameData(boolean force) size_t length; INT32 i, j; UINT8 btemp; - savebuffer_t save = {0}; + savebuffer_t save; if (!gamedataloaded) return; // If never loaded (-nodata), don't save - if (P_SaveBufferAlloc(&save, length) == false) + save.size = length; + save.p = save.buffer = (UINT8 *)malloc(save.size); + if (!save.p) { CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n")); return; } + save.end = save.buffer + save.size; if (majormods && !force) { - P_SaveBufferFree(&save); + free(save.buffer); + save.p = save.buffer = NULL; return; } @@ -3912,7 +3923,7 @@ void G_SaveGameData(boolean force) length = save.p - save.buffer; FIL_WriteFile(va(pandf, srb2home, gamedatafilename), save.buffer, length); - P_SaveBufferFree(&save); + free(save.buffer); } #define VERSIONSIZE 16 @@ -3928,7 +3939,8 @@ static void M_ForceLoadGameResponse(INT32 ch) if (ch != 'y' && ch != KEY_ENTER) { //refused - P_SaveBufferFree(&save); + Z_Free(save.buffer); + save.p = save.buffer = NULL; startonmapnum = 0; M_SetupNextMenu(&SP_LoadDef); return; @@ -3942,7 +3954,8 @@ static void M_ForceLoadGameResponse(INT32 ch) M_ClearMenus(true); // so ESC backs out to title M_StartMessage(M_GetText("Savegame file corrupted\n\nPress ESC\n"), NULL, MM_NOTHING); Command_ExitGame_f(); - P_SaveBufferFree(&save); + Z_Free(save.buffer); + save.p = save.buffer = NULL; startonmapnum = 0; // no cheating! @@ -3951,7 +3964,8 @@ static void M_ForceLoadGameResponse(INT32 ch) } // done - P_SaveBufferFree(&save); + Z_Free(save.buffer); + save.p = save.buffer = NULL; startonmapnum = 0; //set cursaveslot to -1 so nothing gets saved. @@ -3976,9 +3990,10 @@ static void M_ForceLoadGameResponse(INT32 ch) // void G_LoadGame(UINT32 slot, INT16 mapoverride) { + size_t length; char vcheck[VERSIONSIZE]; char savename[255]; - savebuffer_t save = {0}; + savebuffer_t save; // memset savedata to all 0, fixes calling perfectly valid saves corrupt because of bots memset(&savedata, 0, sizeof(savedata)); @@ -3990,12 +4005,17 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride) sprintf(savename, savegamename, slot); - if (P_SaveBufferFromFile(&save, savename) == false) + length = FIL_ReadFile(savename, &save.buffer); + if (!length) { CONS_Printf(M_GetText("Couldn't read file %s\n"), savename); return; } + save.p = save.buffer; + save.size = length; + save.end = save.buffer + save.size; + memset(vcheck, 0, sizeof (vcheck)); sprintf(vcheck, "version %d", VERSION); if (strcmp((const char *)save.p, (const char *)vcheck)) @@ -4008,7 +4028,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride) M_ClearMenus(true); // so ESC backs out to title M_StartMessage(M_GetText("Save game from different version\n\nPress ESC\n"), NULL, MM_NOTHING); Command_ExitGame_f(); - P_SaveBufferFree(&save); + Z_Free(save.buffer); // no cheating! memset(&savedata, 0, sizeof(savedata)); @@ -4026,7 +4046,8 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride) M_ClearMenus(true); // so ESC backs out to title M_StartMessage(M_GetText("Savegame file corrupted\n\nPress ESC\n"), NULL, MM_NOTHING); Command_ExitGame_f(); - P_SaveBufferFree(&save); + Z_Free(save.buffer); + save.p = save.buffer = NULL; // no cheating! memset(&savedata, 0, sizeof(savedata)); @@ -4034,7 +4055,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride) } // done - P_SaveBufferFree(&save); + Z_Free(save.buffer); displayplayers[0] = consoleplayer; multiplayer = false; @@ -4057,7 +4078,7 @@ void G_SaveGame(UINT32 savegameslot) boolean saved; char savename[256] = ""; const char *backup; - savebuffer_t save = {0}; + savebuffer_t save; sprintf(savename, savegamename, savegameslot); backup = va("%s",savename); @@ -4071,11 +4092,14 @@ void G_SaveGame(UINT32 savegameslot) char name[VERSIONSIZE]; size_t length; - if (P_SaveBufferAlloc(&save, SAVEGAMESIZE) == false) + save.size = SAVEGAMESIZE; + save.p = save.buffer = (UINT8 *)malloc(save.size); + if (!save.p) { CONS_Alert(CONS_ERROR, M_GetText("No more free memory for saving game data\n")); return; } + save.end = save.buffer + save.size; memset(name, 0, sizeof (name)); sprintf(name, "version %d", VERSION); @@ -4085,7 +4109,7 @@ void G_SaveGame(UINT32 savegameslot) length = save.p - save.buffer; saved = FIL_WriteFile(backup, save.buffer, length); - P_SaveBufferFree(&save); + free(save.buffer); } gameaction = ga_nothing; @@ -6189,7 +6213,9 @@ void G_RecordDemo(const char *name) maxsize = cv_maxdemosize.value*1024*1024; - P_SaveBufferAlloc(&demobuf, maxsize); + demobuf.size = maxsize; + demobuf.buffer = (UINT8 *)malloc(maxsize); + demobuf.end = demobuf.buffer + demobuf.size; if (demobuf.buffer) demo.recording = true; @@ -6204,9 +6230,11 @@ void G_RecordMetal(void) maxsize = cv_maxdemosize.value*1024*1024; if (demobuf.buffer) free(demobuf.buffer); - P_SaveBufferAlloc(&demobuf, maxsize); + demobuf.size = maxsize; + demobuf.buffer = (UINT8 *)malloc(maxsize); demobuf.p = NULL; metalrecording = false; + demobuf.end = demobuf.buffer + demobuf.size; if (demobuf.buffer) metalrecording = true; @@ -7011,7 +7039,7 @@ void G_DoPlayDemo(char *defdemoname) if (FIL_CheckExtension(defdemoname)) { //FIL_DefaultExtension(defdemoname, ".lmp"); - if (P_SaveBufferFromFile(&demobuf, defdemoname) == false) + if (!FIL_ReadFile(defdemoname, &demobuf.buffer)) { snprintf(msg, 1024, M_GetText("Failed to read file '%s'.\n"), defdemoname); CONS_Alert(CONS_ERROR, "%s", msg); @@ -7019,20 +7047,20 @@ void G_DoPlayDemo(char *defdemoname) M_StartMessage(msg, NULL, MM_NOTHING); return; } + demobuf.p = demobuf.buffer; } // load demo resource from WAD - else + else if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR) { - if ((l = W_CheckNumForName(defdemoname)) == LUMPERROR) - { - snprintf(msg, 1024, M_GetText("Failed to read lump '%s'.\n"), defdemoname); - CONS_Alert(CONS_ERROR, "%s", msg); - gameaction = ga_nothing; - M_StartMessage(msg, NULL, MM_NOTHING); - return; - } - - P_SaveBufferFromLump(&demobuf, l); + snprintf(msg, 1024, M_GetText("Failed to read lump '%s'.\n"), defdemoname); + CONS_Alert(CONS_ERROR, "%s", msg); + gameaction = ga_nothing; + M_StartMessage(msg, NULL, MM_NOTHING); + return; + } + else // it's an internal demo + { + demobuf.buffer = demobuf.p = W_CacheLumpNum(l, PU_STATIC); #if defined(SKIPERRORS) && !defined(DEVELOP) skiperrors = true; // SRB2Kart: Don't print warnings for staff ghosts, since they'll inevitably happen when we make bugfixes/changes... #endif @@ -8037,7 +8065,8 @@ ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void) #endif saved = FIL_WriteFile(va("%sMS.LMP", G_BuildMapName(gamemap)), demobuf.buffer, demobuf.p - demobuf.buffer); // finally output the file. } - Z_Free(demobuf.buffer); + free(demobuf.buffer); + demobuf.buffer = NULL; metalrecording = false; if (saved) I_Error("Saved to %sMS.LMP", G_BuildMapName(gamemap)); @@ -8226,7 +8255,8 @@ void G_SaveDemo(void) if (FIL_WriteFile(va(pandf, srb2home, demoname), demobuf.buffer, demobuf.p - demobuf.buffer)) // finally output the file. demo.savemode = DSM_SAVED; - Z_Free(demobuf.buffer); + free(demobuf.buffer); + demobuf.buffer = NULL; demo.recording = false; if (modeattacking != ATTACKING_RECORD) diff --git a/src/g_game.h b/src/g_game.h index b5a888477..c92e0652a 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -33,6 +33,8 @@ extern INT32 player_name_changes[MAXPLAYERS]; extern player_t players[MAXPLAYERS]; extern boolean playeringame[MAXPLAYERS]; +extern savebuffer_t demobuf; + // ====================================== // DEMO playback/recording related stuff. // ====================================== diff --git a/src/p_saveg.c b/src/p_saveg.c index 2f51dba15..e3a1f1f6d 100644 --- a/src/p_saveg.c +++ b/src/p_saveg.c @@ -3551,92 +3551,3 @@ boolean P_LoadNetGame(savebuffer_t *save, boolean reloading) return READUINT8(save->p) == 0x1d; } - -boolean P_SaveBufferZAlloc(savebuffer_t *save, size_t alloc_size, INT32 tag, void *user) -{ - I_Assert(save->buffer == NULL); - save->buffer = (UINT8 *)Z_Malloc(alloc_size, tag, user); - - if (save->buffer == NULL) - { - return false; - } - - save->size = alloc_size; - save->p = save->buffer; - save->end = save->buffer + save->size; - - return true; -} - -boolean P_SaveBufferFromExisting(savebuffer_t *save, UINT8 *existing_buffer, size_t existing_size) -{ - I_Assert(save->buffer == NULL); - - if (existing_buffer == NULL || existing_size == 0) - { - return false; - } - - save->buffer = existing_buffer; - save->size = existing_size; - - save->p = save->buffer; - save->end = save->buffer + save->size; - - return true; -} - -boolean P_SaveBufferFromLump(savebuffer_t *save, lumpnum_t lump) -{ - I_Assert(save->buffer == NULL); - - if (lump == LUMPERROR) - { - return false; - } - - save->buffer = (UINT8 *)W_CacheLumpNum(lump, PU_STATIC); - - if (save->buffer == NULL) - { - return false; - } - - save->size = W_LumpLength(lump); - - save->p = save->buffer; - save->end = save->buffer + save->size; - - return true; -} - -boolean P_SaveBufferFromFile(savebuffer_t *save, char const *name) -{ - size_t len = 0; - - I_Assert(save->buffer == NULL); - len = FIL_ReadFile(name, &save->buffer); - - if (len != 0) - { - save->size = len; - - save->p = save->buffer; - save->end = save->buffer + save->size; - } - - return len; -} - -static void P_SaveBufferInvalidate(savebuffer_t *save) -{ - save->buffer = save->p = save->end = NULL; - save->size = 0; -} - -void P_SaveBufferFree(savebuffer_t *save) -{ - Z_Free(save->buffer); - P_SaveBufferInvalidate(save); -} diff --git a/src/p_saveg.h b/src/p_saveg.h index 1cd667af8..c8b83d004 100644 --- a/src/p_saveg.h +++ b/src/p_saveg.h @@ -49,13 +49,6 @@ typedef struct size_t size; } savebuffer_t; -boolean P_SaveBufferZAlloc(savebuffer_t *save, size_t alloc_size, INT32 tag, void *user); -#define P_SaveBufferAlloc(a,b) P_SaveBufferZAlloc(a, b, PU_STATIC, NULL) -boolean P_SaveBufferFromExisting(savebuffer_t *save, UINT8 *existing_buffer, size_t existing_size); -boolean P_SaveBufferFromLump(savebuffer_t *save, lumpnum_t lump); -boolean P_SaveBufferFromFile(savebuffer_t *save, char const *name); -void P_SaveBufferFree(savebuffer_t *save); - // Persistent storage/archiving. // These are the load / save game routines.