From e1f821e121c5032fbafee7d0eefc9f2cbd3efc20 Mon Sep 17 00:00:00 2001 From: hayaunderscore Date: Sun, 26 Nov 2023 10:16:16 +0800 Subject: [PATCH 1/3] 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 38f063f62..dceaafa29 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3012,6 +3012,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 @@ -3347,7 +3350,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) @@ -5346,7 +5349,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); } @@ -5433,6 +5443,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 41bd5c6e1..498c46bf4 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -3274,6 +3274,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 #. From 76a233148b508a48c93f88a7f27f7521a066f230 Mon Sep 17 00:00:00 2001 From: Indev Date: Sun, 14 Jan 2024 18:03:20 +0300 Subject: [PATCH 2/3] Restore old speedometer offset cvar names Changed from "speed" to "spdm" in refactor accidently oops --- src/g_game.h | 2 +- src/k_kart.c | 8 ++++---- src/m_menu.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/g_game.h b/src/g_game.h index b45e42875..a57468a2e 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -141,7 +141,7 @@ DECL_HUD_OFFSET(item); // Item box DECL_HUD_OFFSET(time); // Time DECL_HUD_OFFSET(laps); // Number of laps DECL_HUD_OFFSET(dnft); // Countdown (did not finish timer) -DECL_HUD_OFFSET(spdm); // Speedometer +DECL_HUD_OFFSET(speed); // Speedometer DECL_HUD_OFFSET(posi); // Position in race DECL_HUD_OFFSET(face); // Mini rankings DECL_HUD_OFFSET(stcd); // Starting countdown diff --git a/src/k_kart.c b/src/k_kart.c index 46d891890..3170bc143 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -40,7 +40,7 @@ IMPL_HUD_OFFSET(item); // Item box IMPL_HUD_OFFSET(time); // Time IMPL_HUD_OFFSET(laps); // Number of laps IMPL_HUD_OFFSET(dnft); // Countdown (did not finish timer) -IMPL_HUD_OFFSET(spdm); // Speedometer +IMPL_HUD_OFFSET(speed); // Speedometer IMPL_HUD_OFFSET(posi); // Position in race IMPL_HUD_OFFSET(face); // Mini rankings IMPL_HUD_OFFSET(stcd); // Starting countdown @@ -685,7 +685,7 @@ void K_RegisterKartStuff(void) REG_HUD_OFFSET(time); // Time REG_HUD_OFFSET(laps); // Number of laps REG_HUD_OFFSET(dnft); // Countdown (did not finish timer) - REG_HUD_OFFSET(spdm); // Speedometer + REG_HUD_OFFSET(speed); // Speedometer REG_HUD_OFFSET(posi); // Position in race REG_HUD_OFFSET(face); // Mini rankings REG_HUD_OFFSET(stcd); // Starting countdown @@ -7451,8 +7451,8 @@ static void K_initKartHUD(void) LAPS_X = 9 + cv_laps_xoffset.value; // 9 LAPS_Y = BASEVIDHEIGHT - 29 + cv_laps_yoffset.value; // 171 // Speedometer - SPDM_X = 9 + cv_spdm_xoffset.value; // 9 - SPDM_Y = BASEVIDHEIGHT - 45 + cv_spdm_yoffset.value; // 155 + SPDM_X = 9 + cv_speed_xoffset.value; // 9 + SPDM_Y = BASEVIDHEIGHT - 45 + cv_speed_yoffset.value; // 155 // Position Number POSI_X = BASEVIDWIDTH - 9 + cv_posi_xoffset.value; // 268 POSI_Y = BASEVIDHEIGHT - 9 + cv_posi_yoffset.value; // 138 diff --git a/src/m_menu.c b/src/m_menu.c index c46cf9cca..d851801a4 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2120,8 +2120,8 @@ static menuitem_t OP_HudOffsetMenu[] = {IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_laps_yoffset, 60}, {IT_HEADER, NULL, "Speedometer", NULL, 70}, - {IT_STRING | IT_CVAR, NULL, "Horizontal Offset", &cv_spdm_xoffset, 75}, - {IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_spdm_yoffset, 80}, + {IT_STRING | IT_CVAR, NULL, "Horizontal Offset", &cv_speed_xoffset, 75}, + {IT_STRING | IT_CVAR, NULL, "Vertical Offset", &cv_speed_yoffset, 80}, {IT_HEADER, NULL, "Mini Rankings", NULL, 90}, {IT_STRING | IT_CVAR, NULL, "Horizontal Offset", &cv_face_xoffset, 95}, From d0761d00441fa62f1a1c25ae3145df8870244a82 Mon Sep 17 00:00:00 2001 From: Alug Date: Sun, 14 Jan 2024 21:29:14 +0100 Subject: [PATCH 3/3] background for missing 4th player screen in 4 player splitscreen just like software does c: --- src/hardware/hw_main.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 9ba76a32b..a0999bfd1 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -6177,6 +6177,20 @@ void HWR_RenderFrame(INT32 viewnumber, player_t *player, boolean skybox) gr_windowcenterx += gr_viewwidth; } + if (splitscreen == 2 && player == &players[displayplayers[2]]) + { + // V_DrawPatchFill, but for the fourth screen only + GLPatch_t *gpatch = W_CachePatchName("SRB2BACK", PU_CACHE); + INT32 dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy); + INT32 x, y, pw = SHORT(gpatch->width) * dupz, ph = SHORT(gpatch->height) * dupz; + + for (x = vid.width>>1; x < vid.width; x += pw) + { + for (y = vid.height>>1; y < vid.height; y += ph) + V_DrawScaledPatch(x, y, V_NOSCALESTART, gpatch); + } + } + // check for new console commands. NetUpdate();