fixup conflicts

This commit is contained in:
Alug committed 2024-12-29 15:58:43 +01:00
1 parent 72383520cb
commit 22e65cd5e7
4 files changed
+60 -29

No files matched your search

+19 -22
View File
@@ -5995,7 +5995,7 @@ void G_RecordDemo(const char *name)
{
INT32 maxsize;
demo_p = NULL;
demobuf.p = NULL;
G_ResetDemoRecording();
demoend = NULL;
@@ -6008,8 +6008,8 @@ void G_RecordDemo(const char *name)
maxsize = cv_maxdemosize.value*1024*1024;
demobuffer = Z_Malloc(maxsize, PU_STATIC, NULL);
demoend = demobuffer + maxsize;
demobuf.buffer = Z_Malloc(maxsize, PU_STATIC, NULL);
demoend = demobuf.buffer + maxsize;
if (demobuf.buffer)
demo.recording = true;
@@ -6022,12 +6022,12 @@ void G_RecordMetal(void)
{
INT32 maxsize;
maxsize = cv_maxdemosize.value*1024*1024;
if (demobuffer)
Z_Free(demobuffer);
demo_p = NULL;
if (demobuf.buffer)
Z_Free(demobuf.buffer);
demobuf.p = NULL;
metalrecording = false;
demobuffer = Z_Malloc(maxsize, PU_STATIC, NULL);
demoend = demobuffer + maxsize;
demobuf.buffer = Z_Malloc(maxsize, PU_STATIC, NULL);
demoend = demobuf.buffer + maxsize;
if (demobuf.buffer)
metalrecording = true;
@@ -6124,7 +6124,7 @@ void G_BeginRecording(void)
break;
}
WRITEUINT32(demobuf.p,P_GetInitSeed());
WRITEUINT32(demobuf.p, P_GetInitSeed());
// Reserved for extrainfo location from start of file
demoinfo_p = demobuf.p;
@@ -7824,8 +7824,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(demobuffer);
demobuffer = NULL;
Z_Free(demobuf.buffer);
demobuf.buffer = NULL;
metalrecording = false;
if (saved)
I_Error("Saved to %sMS.LMP", G_BuildMapName(gamemap));
@@ -7934,10 +7934,7 @@ boolean G_CheckDemoStatus(void)
if (modeattacking || demo.savemode != DSM_NOTSAVING)
{
if (demobuf.p)
{
G_SaveDemo();
}
G_SaveDemo();
return true;
}
@@ -7948,9 +7945,9 @@ boolean G_CheckDemoStatus(void)
void G_ResetDemoRecording(void)
{
if (demobuffer)
Z_Free(demobuffer);
demobuffer = NULL;
if (demobuf.buffer)
Z_Free(demobuf.buffer);
demobuf.buffer = NULL;
demo.recording = false;
}
@@ -7958,16 +7955,16 @@ static void G_ResetDemoPlayback(char *pdemoname)
{
if (pdemoname)
Z_Free(pdemoname);
if (demobuffer)
Z_Free(demobuffer);
demobuffer = NULL;
if (demobuf.buffer)
Z_Free(demobuf.buffer);
demobuf.buffer = NULL;
demo.playback = false;
demo.title = false;
}
void G_SaveDemo(void)
{
if (!demo_p)
if (!demobuf.p)
{
CONS_Alert(CONS_ERROR, "Failed to save Demo. No Demo pointer exists!\n");
// reset the demo buffer
+33
View File
@@ -934,6 +934,7 @@ int LUA_HookHurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source)
return hook.status;
}
#if 0
void LUA_HookNetArchive(lua_CFunction archFunc)
{
const hook_t * map = &hookIds[HOOK(NetVars)];
@@ -964,6 +965,38 @@ void LUA_HookNetArchive(lua_CFunction archFunc)
// stack: tables
}
}
#endif
void LUA_HookNetArchive(lua_CFunction archFunc, savebuffer_t *save) //
{
const hook_t * map = &hookIds[HOOK(NetVars)];
Hook_State hook;
/* this is a remarkable case where the stack isn't reset */
if (map->numHooks > 0)
{
// stack: tables
I_Assert(lua_gettop(gL) > 0);
I_Assert(lua_istable(gL, -1));
push_error_handler();
lua_insert(gL, EINDEX);
begin_hook_values(&hook);
// tables becomes an upvalue of archFunc
lua_pushvalue(gL, -1);
lua_pushlightuserdata(gL, save);
lua_pushcclosure(gL, archFunc, 2);
// stack: tables, savebuffer_t, archFunc
init_hook_call(&hook, 0, res_none);
call_mapped(&hook, map);
lua_pop(gL, 1); // pop archFunc
lua_remove(gL, EINDEX); // pop error handler
// stack: tables
}
}
void LUA_HookPlayerQuit(player_t *plr, int reason)
{
+5 -4
View File
@@ -1309,11 +1309,11 @@ void LUA_Archive(savebuffer_t *save, boolean network)
}
WRITEUINT32(save->p, UINT32_MAX); // end of mobjs marker, replaces mobjnum.
LUAh_NetArchiveHook(NetArchive, save); // call the NetArchive hook in archive mode
LUA_HookNetArchive(NetArchive, save); // call the NetArchive hook in archive mode
//LUA_HookNetArchive(NetArchive); // call the NetArchive hook in archive mode
}
LUA_HookNetArchive(NetArchive); // call the NetArchive hook in archive mode
ArchiveTables();
ArchiveTables(&save->p);
if (gL)
lua_pop(gL, 1); // pop tables
@@ -1350,7 +1350,8 @@ void LUA_UnArchive(savebuffer_t *save, boolean network)
}
} while(mobjnum != UINT32_MAX); // repeat until end of mobjs marker.
LUAh_NetArchiveHook(NetUnArchive, save); // call the NetArchive hook in unarchive mode
LUA_HookNetArchive(NetUnArchive, save); // call the NetArchive hook in unarchive mode
//LUA_HookNetArchive(NetUnArchive); // call the NetArchive hook in unarchive mode
}
UnArchiveTables(&save->p, network);
+3 -3
View File
@@ -296,7 +296,7 @@ static void P_NetArchivePlayers(savebuffer_t *save, boolean resending)
//
// P_NetUnArchivePlayers
//
static void P_NetUnArchivePlayers(boolean reloading)
static void P_NetUnArchivePlayers(savebuffer_t *save, boolean reloading)
{
INT32 i, j;
UINT16 flags;
@@ -307,7 +307,7 @@ static void P_NetUnArchivePlayers(boolean reloading)
for (i = 0; i < MAXPLAYERS; i++)
{
if (reloading)
adminplayers[i] = (INT32)READSINT8(save_p);
adminplayers[i] = (INT32)READSINT8(save->p);
// Do NOT memset player struct to 0
// other areas may initialize data elsewhere
@@ -318,7 +318,7 @@ static void P_NetUnArchivePlayers(boolean reloading)
// NOTE: sending tics should (hopefully) no longer be necessary
if (reloading)
READSTRINGN(save_p, player_names[i], MAXPLAYERNAME);
READSTRINGN(save->p, player_names[i], MAXPLAYERNAME);
players[i].aiming = READANGLE(save->p);
players[i].awayviewaiming = READANGLE(save->p);