Revert "Contain end & size into savebuffer_t"

This reverts commit 1a810bc923.
This commit is contained in:
Alug committed 2024-09-16 15:55:22 +02:00
1 parent ce6596edde
commit 47aa62092e
5 files changed
+38 -55

No files matched your search

+12 -20
View File
@@ -1673,6 +1673,8 @@ static boolean SV_SendServerConfig(INT32 node)
}
#ifdef JOININGAME
#define SAVEGAMESIZE (768*1024)
static void SV_SendSaveGame(INT32 node, boolean resending)
{
size_t length, compressedlen;
@@ -1681,8 +1683,7 @@ static void SV_SendSaveGame(INT32 node, boolean resending)
UINT8 *buffertosend;
// first save it in a malloced buffer
save.size = NETSAVEGAMESIZE;
save.buffer = (UINT8 *)malloc(save.size);
save.buffer = (UINT8 *)malloc(SAVEGAMESIZE);
if (!save.buffer)
{
CONS_Alert(CONS_ERROR, M_GetText("No more free memory for savegame\n"));
@@ -1691,14 +1692,14 @@ static void SV_SendSaveGame(INT32 node, boolean resending)
// Leave room for the uncompressed length.
save.p = save.buffer + sizeof(UINT32);
save.end = save.buffer + save.size;
P_SaveNetGame(&save, resending);
length = save.p - save.buffer;
if (length > NETSAVEGAMESIZE)
if (length > SAVEGAMESIZE)
{
free(save.buffer);
save.p = NULL;
I_Error("Savegame buffer overrun");
}
@@ -1715,6 +1716,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
free(save.buffer);
// State that we're compressed.
@@ -1725,7 +1727,7 @@ static void SV_SendSaveGame(INT32 node, boolean resending)
else
{
// Compression failed to make it smaller; send original
Z_Free(compressedsave);
free(compressedsave);
// State that we're not compressed
buffertosend = save.buffer;
@@ -1733,6 +1735,7 @@ static void SV_SendSaveGame(INT32 node, boolean resending)
}
SV_SendRam(node, buffertosend, length, SF_Z_RAM, 0);
save.p = NULL;
// Remember when we started sending the savegame so we can handle timeouts
sendingsavegame[node] = true;
@@ -1755,8 +1758,7 @@ static void SV_SavedGame(void)
sprintf(tmpsave, "%s" PATHSEP TMPSAVENAME, srb2home);
// first save it in a malloced buffer
save.size = NETSAVEGAMESIZE;
save.p = save.buffer = (UINT8 *)malloc(save.size);
save.p = save.buffer = (UINT8 *)malloc(SAVEGAMESIZE);
if (!save.p)
{
CONS_Alert(CONS_ERROR, M_GetText("No more free memory for savegame\n"));
@@ -1765,14 +1767,13 @@ static void SV_SavedGame(void)
return;
}
save.end = save.buffer + save.size;
P_SaveNetGame(&save);
length = save.p - save.buffer;
if (length > NETSAVEGAMESIZE)
if (length > SAVEGAMESIZE)
{
free(save.buffer);
save.p = NULL;
I_Error("Savegame buffer overrun");
}
@@ -1781,6 +1782,7 @@ static void SV_SavedGame(void)
CONS_Printf(M_GetText("Didn't save %s for netgame"), tmpsave);
free(save.buffer);
save.p = NULL;
}
#undef TMPSAVENAME
@@ -1805,8 +1807,6 @@ static void CL_LoadReceivedSavegame(boolean reloading)
}
save.p = save.buffer;
save.size = length;
save.end = save.buffer + save.size;
// Decompress saved game if necessary.
decompressedlen = READUINT32(save.p);
@@ -1814,13 +1814,9 @@ static void CL_LoadReceivedSavegame(boolean reloading)
if (decompressedlen > 0)
{
UINT8 *decompressedbuffer = Z_Malloc(decompressedlen, PU_STATIC, NULL);
lzf_decompress(save.p, length - sizeof(UINT32), decompressedbuffer, decompressedlen);
Z_Free(save.buffer);
save.p = save.buffer = decompressedbuffer;
save.size = decompressedlen;
save.end = save.buffer + decompressedlen;
}
paused = false;
@@ -6738,8 +6734,6 @@ rewind_t *CL_SaveRewindPoint(size_t demopos)
return NULL;
save.buffer = save.p = rewind->savebuffer;
save.size = NETSAVEGAMESIZE;
save.end = save.buffer + save.size;
P_SaveNetGame(&save, false);
rewind->leveltime = leveltime;
@@ -6766,8 +6760,6 @@ rewind_t *CL_RewindToTime(tic_t time)
return NULL;
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!
+1 -2
View File
@@ -19,7 +19,6 @@
#include "tables.h"
#include "d_player.h"
#include "mserv.h"
#include "p_saveg.h" // NETSAVEGAMESIZE
/*
The 'packet version' is used to distinguish packet formats.
@@ -652,7 +651,7 @@ extern UINT8 hu_redownloadinggamestate;
extern UINT8 hu_stopped; // kart, true when the game is stopped for players due to a disconnecting or connecting player
typedef struct rewind_s {
UINT8 savebuffer[NETSAVEGAMESIZE];
UINT8 savebuffer[(768*1024)];
tic_t leveltime;
size_t demopos;
+1 -3
View File
@@ -5244,9 +5244,7 @@ static void Command_Archivetest_f(void)
((mobj_t *)th)->mobjnum = i++;
// allocate buffer
save.size = 1024;
save.buffer = save.p = ZZ_Alloc(save.size);
save.end = save.buffer + save.size;
save.buffer = save.p = ZZ_Alloc(1024);
// test archive
CONS_Printf("LUA_Archive...\n");
+24 -22
View File
@@ -71,6 +71,9 @@ JoyType_t Joystick2;
JoyType_t Joystick3;
JoyType_t Joystick4;
// 1024 bytes is plenty for a savegame
#define SAVEGAMESIZE (1024)
// SRB2kart
char gamedatafilename[64] = "kartdata.dat";
char timeattackfolder[64] = "kart";
@@ -294,6 +297,7 @@ UINT32 timesBeatenWithEmeralds;
static char demoname[128];
savebuffer_t demobuf;
static UINT8 *demotime_p, *demoinfo_p;
static UINT8 *demoend;
static UINT8 demoflags;
static boolean demosynced = true; // console warning message
@@ -3839,14 +3843,12 @@ void G_SaveGameData(boolean force)
if (!gamedataloaded)
return; // If never loaded (-nodata), don't save
save.size = length;
save.p = save.buffer = (UINT8 *)malloc(save.size);
save.p = save.buffer = (UINT8 *)malloc(GAMEDATASIZE);
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)
{
@@ -3924,6 +3926,7 @@ void G_SaveGameData(boolean force)
FIL_WriteFile(va(pandf, srb2home, gamedatafilename), save.buffer, length);
free(save.buffer);
save.p = save.buffer = NULL;
}
#define VERSIONSIZE 16
@@ -4013,8 +4016,6 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
}
save.p = save.buffer;
save.size = length;
save.end = save.buffer + save.size;
memset(vcheck, 0, sizeof (vcheck));
sprintf(vcheck, "version %d", VERSION);
@@ -4029,6 +4030,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
M_StartMessage(M_GetText("Save game from different version\n\nPress ESC\n"), NULL, MM_NOTHING);
Command_ExitGame_f();
Z_Free(save.buffer);
save.p = save.buffer = NULL;
// no cheating!
memset(&savedata, 0, sizeof(savedata));
@@ -4040,6 +4042,9 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
if (demo.playback) // reset game engine
G_StopDemo();
// paused = false;
// automapactive = false;
// dearchive all the modifications
if (!P_LoadGame(&save, mapoverride))
{
@@ -4056,6 +4061,7 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride)
// done
Z_Free(save.buffer);
save.p = save.buffer = NULL;
displayplayers[0] = consoleplayer;
multiplayer = false;
@@ -4092,14 +4098,12 @@ void G_SaveGame(UINT32 savegameslot)
char name[VERSIONSIZE];
size_t length;
save.size = SAVEGAMESIZE;
save.p = save.buffer = (UINT8 *)malloc(save.size);
save.p = save.buffer = (UINT8 *)malloc(SAVEGAMESIZE);
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);
@@ -4110,6 +4114,7 @@ void G_SaveGame(UINT32 savegameslot)
length = save.p - save.buffer;
saved = FIL_WriteFile(backup, save.buffer, length);
free(save.buffer);
save.p = save.buffer = NULL;
}
gameaction = ga_nothing;
@@ -4610,7 +4615,7 @@ INT32 G_FindMapByNameOrCode(const char *mapname, char **realmapnamep)
#define ZT_AIMING 0x10
#define ZT_DRIFT 0x20
#define ZT_LATENCY 0x40
#define DEMOMARKER 0x80 // demobuf.end
#define DEMOMARKER 0x80 // demoend
UINT8 demo_extradata[MAXPLAYERS];
UINT8 demo_writerng; // 0=no, 1=yes, 2=yes but on a timeout
@@ -5038,7 +5043,7 @@ void G_WriteDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
// attention here for the ticcmd size!
// latest demos with mouse aiming byte in ticcmd
if (!(demoflags & DF_GHOST) && ziptic_p > demobuf.end - 9)
if (!(demoflags & DF_GHOST) && ziptic_p > demoend - 9)
{
G_CheckDemoStatus(); // no more space
return;
@@ -5112,7 +5117,7 @@ void G_GhostAddHit(INT32 playernum, mobj_t *victim)
void G_WriteAllGhostTics(void)
{
UINT8 *save_demo_p = demobuf.p;
#define CHECKSPACE(num) if (demobuf.p+(num) > demobuf.end) { demobuf.p = save_demo_p; G_CheckDemoStatus(); return; }
#define CHECKSPACE(num) if (demobuf.p+(num) > demoend) { demobuf.p = save_demo_p; G_CheckDemoStatus(); return; }
INT32 i, counter = leveltime;
for (i = 0; i < MAXPLAYERS; i++)
@@ -5149,7 +5154,7 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)
UINT8 frame;
UINT8 *save_demo_p = demobuf.p;
#define CHECKSPACE(num) if (demobuf.p+(num) > demobuf.end) { demobuf.p = save_demo_p; G_CheckDemoStatus(); return; }
#define CHECKSPACE(num) if (demobuf.p+(num) > demoend) { demobuf.p = save_demo_p; G_CheckDemoStatus(); return; }
if (!demobuf.p)
return;
@@ -5335,7 +5340,7 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)
// attention here for the ticcmd size!
// latest demos with mouse aiming byte in ticcmd
if (demobuf.p >= demobuf.end - (13 + 9))
if (demobuf.p >= demoend - (13 + 9))
{
G_CheckDemoStatus(); // no more space
return;
@@ -6182,7 +6187,7 @@ void G_WriteMetalTic(mobj_t *metal)
// attention here for the ticcmd size!
// latest demos with mouse aiming byte in ticcmd
if (demobuf.p >= demobuf.end - 32)
if (demobuf.p >= demoend - 32)
{
G_StopMetalRecording(); // no more space
return;
@@ -6196,13 +6201,12 @@ void G_RecordDemo(const char *name)
{
INT32 maxsize;
demobuf.size = 0;
demobuf.p = NULL;
demo.recording = false;
if (demobuf.buffer)
free(demobuf.buffer);
demobuf.buffer = NULL;
demobuf.end = NULL;
demoend = NULL;
if (cv_recordmultiplayerdemos.value)
{
@@ -6213,9 +6217,8 @@ void G_RecordDemo(const char *name)
maxsize = cv_maxdemosize.value*1024*1024;
demobuf.size = maxsize;
demobuf.buffer = (UINT8 *)malloc(maxsize);
demobuf.end = demobuf.buffer + demobuf.size;
demobuf.buffer = malloc(maxsize);
demoend = demobuf.buffer + maxsize;
if (demobuf.buffer)
demo.recording = true;
@@ -6230,11 +6233,10 @@ void G_RecordMetal(void)
maxsize = cv_maxdemosize.value*1024*1024;
if (demobuf.buffer)
free(demobuf.buffer);
demobuf.size = maxsize;
demobuf.buffer = (UINT8 *)malloc(maxsize);
demobuf.p = NULL;
metalrecording = false;
demobuf.end = demobuf.buffer + demobuf.size;
demobuf.buffer = malloc(maxsize);
demoend = demobuf.buffer + maxsize;
if (demobuf.buffer)
metalrecording = true;
-8
View File
@@ -18,12 +18,6 @@
#pragma interface
#endif
// 1024 bytes is plenty for a savegame
#define SAVEGAMESIZE (1024)
// For netgames
#define NETSAVEGAMESIZE (768*1024)
// Persistent storage/archiving.
// These are the load / save game routines.
@@ -45,8 +39,6 @@ typedef struct
{
UINT8 *buffer;
UINT8 *p;
UINT8 *end;
size_t size;
} savebuffer_t;
// Persistent storage/archiving.