From 139d2e6be89667ec4fd65d4fa7aa50bd18a8c405 Mon Sep 17 00:00:00 2001 From: hayaunderscore Date: Sun, 26 Nov 2023 10:16:16 +0800 Subject: [PATCH] Localskins on replays --- src/g_game.c | 29 +++++++++++++++++++++++++++-- src/g_game.h | 1 + src/r_things.c | 2 ++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 42715ed59..aa0296560 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3013,6 +3013,9 @@ void G_SpawnPlayer(INT32 playernum, boolean starpost) } P_MovePlayerToSpawn(playernum, spawnpoint); + // TODO: This is so dumb. + demo_extradata[playernum] |= DXD_LOCALSKIN; + #ifdef HAVE_BLUA LUAh_PlayerSpawn(&players[playernum]); // Lua hook for player spawning :) #endif @@ -3348,7 +3351,7 @@ void G_AddPlayer(INT32 playernum) p->jointime = 0; p->playerstate = PST_REBORN; - demo_extradata[playernum] |= DXD_PLAYSTATE|DXD_COLOR|DXD_NAME|DXD_SKIN; // Set everything + demo_extradata[playernum] |= DXD_PLAYSTATE|DXD_COLOR|DXD_NAME|DXD_SKIN|DXD_LOCALSKIN; // Set everything } void G_ExitLevel(void) @@ -5347,7 +5350,14 @@ void G_ReadDemoExtraData(void) else if (G_RaceGametype()) P_CheckRacers(); // also SRB2Kart } - + if (extradata & DXD_LOCALSKIN) + { + // TODO: Does this work just fine? + M_Memcpy(name, demo_p, 16); + //CONS_Printf("Loaded localskin data from replay: %s\n", name); + demo_p += 16; + SetLocalPlayerSkin(p, name, NULL); + } p = READUINT8(demo_p); } @@ -5434,6 +5444,21 @@ void G_WriteDemoExtraData(void) else WRITEUINT8(demo_p, DXD_PST_PLAYING); } + if (demo_extradata[i] & DXD_LOCALSKIN) + { + // Skin + memset(name, 0, 16); + // check for different localskin conditions + if (players[i].skinlocal && players[i].localskin > 0) + strncpy(name, localskins[players[i].localskin - 1].name, 16); + else if (!players[i].skinlocal && players[i].localskin > 0) + strncpy(name, skins[players[i].localskin - 1].name, 16); + else + strncpy(name, "none", 16); + //CONS_Printf("Saved localskin data to replay: %s\n", name); + M_Memcpy(demo_p,name,16); + demo_p += 16; + } } demo_extradata[i] = 0; diff --git a/src/g_game.h b/src/g_game.h index b45e42875..372801f65 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -297,6 +297,7 @@ extern UINT8 demo_writerng; #define DXD_NAME 0x04 // name changed #define DXD_COLOR 0x08 // color changed #define DXD_PLAYSTATE 0x10 // state changed between playing, spectating, or not in-game +#define DXD_LOCALSKIN 0x20 // localskin changed #define DXD_PST_PLAYING 0x01 #define DXD_PST_SPECTATING 0x02 diff --git a/src/r_things.c b/src/r_things.c index aa23799a9..af5a582b1 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -3272,6 +3272,8 @@ void SetLocalPlayerSkin(INT32 playernum, const char *skinname, consvar_t *cvar) CV_StealthSet(cvar, "none"); } } + + demo_extradata[playernum] |= DXD_LOCALSKIN; } // Same as SetPlayerSkin, but uses the skin #.