From a9a3a0437909ed56ce247aa4fd7a8c8c0e035b9e Mon Sep 17 00:00:00 2001 From: Indev Date: Tue, 17 Sep 2024 17:16:35 +0300 Subject: [PATCH 01/14] Add proper skin search in skin command --- src/d_netcmd.c | 62 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 3cd815dee..126018930 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1255,19 +1255,69 @@ void D_RegisterClientCommands(void) */ static void Skin_FindRealNameSkin(consvar_t *cvar) { - // Not the best way to implements this but it will do. + INT32 matches[MAXSKINS] = {0}; // Skin numbers of matching skins + INT32 matches_pos[MAXSKINS] = {0}; // Index of matching substring + INT32 nummatches = 0; - int i; + INT32 i; const char *value = cvar->string; + for (i = 0; i < numskins; i++) { - if (strncmp(value, skins[i].realname, sizeof skins[i].realname) == 0) - { - // Change the cvar to be the value of the name. - CV_StealthSet(cvar, skins[i].name); + // Perfect match with some skin name, no need to find matching realname + if (strncmp(value, skins[i].name, sizeof skins[i].name) == 0) return; + + const char *match = strcasestr(skins[i].realname, value); + if (match != NULL) + { + matches[nummatches] = i; + matches_pos[nummatches] = match - skins[i].realname; + ++nummatches; } } + + if (nummatches == 1) + { + // Change the cvar to be the value of the name. + CV_StealthSet(cvar, skins[matches[0]].name); + } + else if (nummatches > 1) + { + size_t query_length = strlen(value); + + char start[SKINNAMESIZE+1] = {0}; // Start of name, printed with normal color + char match[SKINNAMESIZE+1] = {0}; // Matching part of name, highlighted in red + const char *end = NULL; // End of the name, printed with normal color. Can be just a pointer into realname part + + CONS_Printf("\x86Multiple matches found:\n"); + + for (i = 0; i < nummatches; ++i) + { + const char *realname = skins[matches[i]].realname; + + if (matches_pos[i] == 0) + start[0] = 0; + else + { + memcpy(start, realname, matches_pos[i]); + start[matches_pos[i]] = 0; + } + + memcpy(match, realname+matches_pos[i], query_length); + match[matches_pos[i] + query_length] = 0; + + end = realname + matches_pos[i] + query_length; + + CONS_Printf("%s\x85%s\x80%s (%s)\n", start, match, end, skins[matches[i]].name); + } + + CONS_Printf("\x86Try be more specific\n"); + } + else + { + CONS_Printf("\x86Skin not found\n"); + } } From b1644d4817774634960b4b70c2cc60995d9ca215 Mon Sep 17 00:00:00 2001 From: Indev Date: Tue, 17 Sep 2024 17:23:16 +0300 Subject: [PATCH 02/14] Ignore case here --- src/d_netcmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 126018930..baba42007 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1265,7 +1265,7 @@ static void Skin_FindRealNameSkin(consvar_t *cvar) for (i = 0; i < numskins; i++) { // Perfect match with some skin name, no need to find matching realname - if (strncmp(value, skins[i].name, sizeof skins[i].name) == 0) + if (strncasecmp(value, skins[i].name, sizeof skins[i].name) == 0) return; const char *match = strcasestr(skins[i].realname, value); From d867868854ddecd260ec16eeda43f71af909dc19 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 17 Sep 2024 16:43:25 +0200 Subject: [PATCH 03/14] Revert "dont run playerjoin hook on resynch" This reverts commit 5f7bf4164db633d4be0cd26e37c974f307b12295. --- src/d_clisrv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index a5899796a..b6eb9930b 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -4437,10 +4437,9 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum) D_AddAutoloadFiles(); - if (!resendingsavegame[node]) - LUAh_PlayerJoin(newplayernum); + LUAh_PlayerJoin(newplayernum); - if (newplayernum == consoleplayer && !resendingsavegame[node]) + if (newplayernum == consoleplayer) LUAh_ServerJoin(); #ifdef HAVE_DISCORDRPC From 8580451bceabaf8aeb09b0c838e509b6002854d5 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 17 Sep 2024 16:46:21 +0200 Subject: [PATCH 04/14] properly reset all splitscreen cameras on resynch also fix some casting --- src/d_clisrv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index b6eb9930b..f14ba8009 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1993,14 +1993,13 @@ static void CL_ReloadReceivedSavegame(void) neededtic = gametic; maketic = neededtic; - // set camera angle to somewhat match where your player is turning + // we dont have P_ForceLocalAngle so were setting it manually here for (i = 0; i <= splitscreen; i++) { - localangle[i] = players[displayplayers[i]].cmd.angleturn<<16; + localangle[i] = (angle_t)(players[displayplayers[i]].cmd.angleturn<<16); + camera[i].subsector = R_PointInSubsector(camera[i].x, camera[i].y); } - camera->subsector = R_PointInSubsector(camera->x, camera->y); - cl_redownloadinggamestate = false; CONS_Printf(M_GetText("Game state reloaded\n")); From ff0dcafeeab6ec43daae1d928be5b8915367a30d Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 17 Sep 2024 16:47:24 +0200 Subject: [PATCH 05/14] make ticcmds on gamestateresend resynch will still stop making em should hopefully fix some weird issues where you might end up somewhere weird if the resend takes a little longer --- src/g_game.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 27758119b..430ae0c7b 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1197,11 +1197,7 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) // why build a ticcmd if we're paused? // Or, for that matter, if we're being reborn. // Kart, don't build a ticcmd if someone is resynching or the server is stopped too so we don't fly off course in bad conditions - if (paused || P_AutoPause() || (gamestate == GS_LEVEL && player->playerstate == PST_REBORN) || hu_resynching -#ifdef SATURNSYNCH - || hu_redownloadinggamestate -#endif - ) + if (paused || P_AutoPause() || (gamestate == GS_LEVEL && player->playerstate == PST_REBORN) || hu_resynching) { cmd->angleturn = (INT16)(lang >> 16); cmd->aiming = G_ClipAimingPitch(&laim); From 30024f234131be241cbab17e8635a9437f250535 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 17 Sep 2024 19:47:24 +0200 Subject: [PATCH 06/14] this is the correct value --- src/hardware/hw_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index ba11cd7c4..c0131ba93 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -4357,9 +4357,7 @@ void HWR_AddTransparentFloor(lumpnum_t lumpnum, extrasubsector_t *xsub, boolean planeinfo->isceiling = isceiling; planeinfo->fixedheight = fixedheight; - - planeinfo->lightlevel = (HWR_ShouldUsePaletteRendering() && (planecolormap && (planecolormap->fog & 1))) ? 255 : lightlevel; - + planeinfo->lightlevel = (HWR_ShouldUsePaletteRendering() && (planecolormap && (planecolormap->fog & 2))) ? 255 : lightlevel; planeinfo->lumpnum = lumpnum; planeinfo->xsub = xsub; planeinfo->alpha = alpha; @@ -4377,9 +4375,7 @@ void HWR_AddTransparentPolyobjectFloor(lumpnum_t lumpnum, polyobj_t *polysector, polyplaneinfo->isceiling = isceiling; polyplaneinfo->fixedheight = fixedheight; - - polyplaneinfo->lightlevel = (HWR_ShouldUsePaletteRendering() && (planecolormap && (planecolormap->fog & 1))) ? 255 : lightlevel; - + polyplaneinfo->lightlevel = (HWR_ShouldUsePaletteRendering() && (planecolormap && (planecolormap->fog & 2))) ? 255 : lightlevel; polyplaneinfo->lumpnum = lumpnum; polyplaneinfo->polysector = polysector; polyplaneinfo->alpha = alpha; From f0a8c27829b2d60993cd4fd9726ac911fb392993 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 17 Sep 2024 20:58:23 +0200 Subject: [PATCH 07/14] Fix crash when trying to send to an unreachable client https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2232 --- src/i_tcp.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/i_tcp.c b/src/i_tcp.c index 77f8aac0c..3baefb94d 100644 --- a/src/i_tcp.c +++ b/src/i_tcp.c @@ -100,6 +100,10 @@ #undef ETIMEDOUT #endif #define ETIMEDOUT WSAETIMEDOUT + #ifdef EHOSTUNREACH + #undef EHOSTUNREACH + #endif + #define EHOSTUNREACH WSAEHOSTUNREACH #ifndef IOC_VENDOR #define IOC_VENDOR 0x18000000 #endif @@ -853,7 +857,7 @@ static void SOCK_Send(void) if (c == ERRSOCKET) { int e = errno; // save error code so it can't be modified later - if (e != ECONNREFUSED && e != EWOULDBLOCK) + if (e != ECONNREFUSED && e != EWOULDBLOCK && e != EHOSTUNREACH) I_Error("SOCK_Send, error sending to node %d (%s) #%u: %s", doomcom->remotenode, SOCK_GetNodeAddress(doomcom->remotenode), e, strerror(e)); } From f5f7b99479c19fb94ecc1049ca79d98e36478533 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 17 Sep 2024 21:02:05 +0200 Subject: [PATCH 08/14] Fix crash if a packet fails to reach the client https://git.do.srb2.org/STJr/SRB2/-/merge_requests/2480 but keeps the returns; --- src/i_tcp.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/i_tcp.c b/src/i_tcp.c index 3baefb94d..d7b0d3374 100644 --- a/src/i_tcp.c +++ b/src/i_tcp.c @@ -104,6 +104,10 @@ #undef EHOSTUNREACH #endif #define EHOSTUNREACH WSAEHOSTUNREACH + #ifdef ENETUNREACH + #undef ENETUNREACH + #endif + #define ENETUNREACH WSAENETUNREACH #ifndef IOC_VENDOR #define IOC_VENDOR 0x18000000 #endif @@ -820,6 +824,8 @@ static inline ssize_t SOCK_SendToAddr(SOCKET_TYPE socket, mysockaddr_t *sockaddr return sendto(socket, (char *)&doomcom->data, doomcom->datalength, 0, &sockaddr->any, d); } +#define ALLOWEDERROR(x) ((x) == ECONNREFUSED || (x) == EWOULDBLOCK || (x) == EHOSTUNREACH || (x) == ENETUNREACH) + static void SOCK_Send(void) { ssize_t c = ERRSOCKET; @@ -835,7 +841,11 @@ static void SOCK_Send(void) for (j = 0; j < broadcastaddresses; j++) { if (myfamily[i] == broadcastaddress[j].any.sa_family) - SOCK_SendToAddr(mysockets[i], &broadcastaddress[j]); + { + c = SOCK_SendToAddr(mysockets[i], &broadcastaddress[j]); + if (c == ERRSOCKET && !ALLOWEDERROR(errno)) + break; + } } } return; @@ -845,7 +855,11 @@ static void SOCK_Send(void) for (i = 0; i < mysocketses; i++) { if (myfamily[i] == clientaddress[doomcom->remotenode].any.sa_family) - SOCK_SendToAddr(mysockets[i], &clientaddress[doomcom->remotenode]); + { + c = SOCK_SendToAddr(mysockets[i], &clientaddress[doomcom->remotenode]); + if (c == ERRSOCKET && !ALLOWEDERROR(errno)) + break; + } } return; } @@ -857,11 +871,12 @@ static void SOCK_Send(void) if (c == ERRSOCKET) { int e = errno; // save error code so it can't be modified later - if (e != ECONNREFUSED && e != EWOULDBLOCK && e != EHOSTUNREACH) + if (!ALLOWEDERROR(e)) I_Error("SOCK_Send, error sending to node %d (%s) #%u: %s", doomcom->remotenode, SOCK_GetNodeAddress(doomcom->remotenode), e, strerror(e)); } } +#undef ALLOWEDERROR #endif #ifndef NONET From 8074bfacb65bf751cfb6c4b7493c3f774095e3eb Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 18 Sep 2024 00:58:37 +0200 Subject: [PATCH 09/14] this does nothing --- src/r_main.c | 50 ++++---------------------------------------------- 1 file changed, 4 insertions(+), 46 deletions(-) diff --git a/src/r_main.c b/src/r_main.c index 0e0e7020e..5a686fb3b 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -173,10 +173,6 @@ static CV_PossibleValue_t maxportals_cons_t[] = {{0, "MIN"}, {12, "MAX"}, {0, NU static CV_PossibleValue_t homremoval_cons_t[] = {{0, "No"}, {1, "Yes"}, {2, "Flash"}, {0, NULL}}; static void Fov_OnChange(void); -static void ChaseCam_OnChange(void); -static void ChaseCam2_OnChange(void); -static void ChaseCam3_OnChange(void); -static void ChaseCam4_OnChange(void); static void FlipCam_OnChange(void); static void FlipCam2_OnChange(void); static void FlipCam3_OnChange(void); @@ -189,10 +185,10 @@ void SendWeaponPref4(void); static void Precipstuff_OnChange(void); consvar_t cv_tailspickup = {"tailspickup", "On", CV_NETVAR|CV_NOSHOWHELP, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_chasecam = {"chasecam", "On", CV_CALL, CV_OnOff, ChaseCam_OnChange, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_chasecam2 = {"chasecam2", "On", CV_CALL, CV_OnOff, ChaseCam2_OnChange, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_chasecam3 = {"chasecam3", "On", CV_CALL, CV_OnOff, ChaseCam3_OnChange, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_chasecam4 = {"chasecam4", "On", CV_CALL, CV_OnOff, ChaseCam4_OnChange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_chasecam = {"chasecam", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_chasecam2 = {"chasecam2", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_chasecam3 = {"chasecam3", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_chasecam4 = {"chasecam4", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_flipcam = {"flipcam", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_flipcam2 = {"flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam2_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_flipcam3 = {"flipcam3", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo, FlipCam3_OnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -272,47 +268,9 @@ void SplitScreen_OnChange(void) } static void Fov_OnChange(void) { - // Shouldn't be needed with render parity? - //if ((netgame || multiplayer) && !cv_debug && cv_fov.value != 90*FRACUNIT) - // CV_Set(&cv_fov, cv_fov.defaultvalue); - R_SetViewSize(); } -static void ChaseCam_OnChange(void) -{ - /*if (!cv_chasecam.value || !cv_useranalog.value) - CV_SetValue(&cv_analog, 0); - else - CV_SetValue(&cv_analog, 1);*/ -} - -static void ChaseCam2_OnChange(void) -{ - if (botingame) - return; - /*if (!cv_chasecam2.value || !cv_useranalog2.value) - CV_SetValue(&cv_analog2, 0); - else - CV_SetValue(&cv_analog2, 1);*/ -} - -static void ChaseCam3_OnChange(void) -{ - /*if (!cv_chasecam3.value || !cv_useranalog3.value) - CV_SetValue(&cv_analog3, 0); - else - CV_SetValue(&cv_analog3, 1);*/ -} - -static void ChaseCam4_OnChange(void) -{ - /*if (!cv_chasecam4.value || !cv_useranalog4.value) - CV_SetValue(&cv_analog4, 0); - else - CV_SetValue(&cv_analog4, 1);*/ -} - static void FlipCam_OnChange(void) { SendWeaponPref(); From d6d19d5dabfa95d9dd8499fade965b103558ed95 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 18 Sep 2024 01:02:42 +0200 Subject: [PATCH 10/14] smol cleanup --- src/m_menu.c | 41 +++++------------------------------------ 1 file changed, 5 insertions(+), 36 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 5a53d11bb..c42c923e2 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3327,8 +3327,6 @@ static void Newgametype_OnChange(void) } CV_SetValue(&cv_nextmap, M_FindFirstMap(value)); - //CV_AddValue(&cv_nextmap, -1); - //CV_AddValue(&cv_nextmap, 1); } } } @@ -4295,7 +4293,9 @@ void M_Drawer(void) { // now that's more readable with a faded background (yeah like Quake...) if (ShouldDrawMenuBG()) + { V_DrawFadeScreen(0xFF00, 16); + } if (currentMenu->drawroutine) { @@ -5608,27 +5608,13 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt) switch (levellistmode) { case LLM_CREATESERVER: - // Should the map be hidden? - //if (mapheaderinfo[mapnum]->menuflags & LF2_HIDEINMENU && mapnum+1 != gamemap) - //return false; - // Should the map be hidden? <-- well imma wanna toggle it, its just annoying being unable to select hell maps in mapselect if ((mapheaderinfo[mapnum]->menuflags & LF2_HIDEINMENU && mapnum+1 != gamemap) && (gt == GT_RACE && (mapheaderinfo[mapnum]->typeoflevel & TOL_RACE))) // map hell - { - if (cv_showallmaps.value) - return true; - else - return false; - } + return cv_showallmaps.value; // same goes here, just show every map if i want to if (M_MapLocked(mapnum+1)) // not unlocked - { - if (cv_showallmaps.value) - return true; - else - return false; - } + return cv_showallmaps.value; if ((gt == GT_MATCH || gt == GT_TEAMMATCH) && (mapheaderinfo[mapnum]->typeoflevel & TOL_MATCH)) return true; @@ -5638,18 +5624,7 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt) return false; - /*case LLM_LEVELSELECT: - if (mapheaderinfo[mapnum]->levelselect != maplistoption) - return false; - - if (M_MapLocked(mapnum+1)) - return false; // not unlocked - - return true;*/ case LLM_RECORDATTACK: - /*if (!(mapheaderinfo[mapnum]->menuflags & LF2_RECORDATTACK)) - return false;*/ - if (!(mapheaderinfo[mapnum]->typeoflevel & TOL_RACE)) return false; @@ -5662,12 +5637,6 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt) if (mapheaderinfo[mapnum]->menuflags & LF2_HIDEINMENU) return false; // map hell - /*if (mapheaderinfo[mapnum]->menuflags & LF2_NOVISITNEEDED) - return true; - - if (!mapvisited[mapnum]) - return false;*/ - return true; default: return false; @@ -11753,7 +11722,7 @@ static void M_SetupMultiPlayer4(INT32 choice) //change the y offsets of the menu depending on cvar settings SKINSELECTMENUEDIT - + sortSkinGrid(); MP_PlayerSetupDef.prevMenu = currentMenu; From f77f7361a9f71e7a1b59d446044e9fccd78ef9c7 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 18 Sep 2024 01:06:54 +0200 Subject: [PATCH 11/14] this also does nothing --- src/g_game.c | 138 ++++--------------------------------------------- src/hu_stuff.c | 17 ------ 2 files changed, 10 insertions(+), 145 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 430ae0c7b..83150ea94 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -357,10 +357,6 @@ consvar_t cv_demochangemap = {"netdemo_savemapchange", "Disabled", CV_SAVE, demo static UINT8 *savebuffer; // Analog Control -static void UserAnalog_OnChange(void); -static void UserAnalog2_OnChange(void); -static void UserAnalog3_OnChange(void); -static void UserAnalog4_OnChange(void); static void Analog_OnChange(void); static void Analog2_OnChange(void); static void Analog3_OnChange(void); @@ -446,10 +442,10 @@ consvar_t cv_analog = {"analog", "Off", CV_CALL, CV_OnOff, Analog_OnChange, 0, N consvar_t cv_analog2 = {"analog2", "Off", CV_CALL, CV_OnOff, Analog2_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_analog3 = {"analog3", "Off", CV_CALL, CV_OnOff, Analog3_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_analog4 = {"analog4", "Off", CV_CALL, CV_OnOff, Analog4_OnChange, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_useranalog = {"useranalog", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog_OnChange, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_useranalog2 = {"useranalog2", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog2_OnChange, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_useranalog3 = {"useranalog3", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog3_OnChange, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_useranalog4 = {"useranalog4", "Off", CV_SAVE|CV_CALL, CV_OnOff, UserAnalog4_OnChange, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_useranalog = {"useranalog", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_useranalog2 = {"useranalog2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_useranalog3 = {"useranalog3", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_useranalog4 = {"useranalog4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_turnaxis = {"joyaxis_turn", "Left X", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_moveaxis = {"joyaxis_move", "None", CV_SAVE, joyaxis_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -511,8 +507,8 @@ static CV_PossibleValue_t driftsparkpulse_t[] = {{0, "MIN"}, {FRACUNIT*3, "MAX"} consvar_t cv_driftsparkpulse = {"driftsparkpulse", "1.4", CV_FLOAT | CV_SAVE, driftsparkpulse_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static CV_PossibleValue_t stretchfactor_t[] = { - {0, "Off"}, {FRACUNIT/8, "0.125"}, {FRACUNIT/4, "0.250"}, - {3*FRACUNIT/8, "0.375"}, {FRACUNIT/2, "0.500"}, {5*FRACUNIT/8, "0.625"}, + {0, "Off"}, {FRACUNIT/8, "0.125"}, {FRACUNIT/4, "0.250"}, + {3*FRACUNIT/8, "0.375"}, {FRACUNIT/2, "0.500"}, {5*FRACUNIT/8, "0.625"}, {3*FRACUNIT/4, "0.750"}, {7*FRACUNIT/8, "0.875"}, {FRACUNIT, "Max"}, {0, NULL}}; consvar_t cv_gravstretch = {"gravstretch", "0", CV_SAVE, stretchfactor_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -596,15 +592,6 @@ void G_ClearRecords(void) } } -// For easy retrieval of records -/*UINT32 G_GetBestScore(INT16 map) -{ - if (!mainrecords[map-1]) - return 0; - - return mainrecords[map-1]->score; -}*/ - tic_t G_GetBestTime(INT16 map) { if (!mainrecords[map-1] || mainrecords[map-1]->time <= 0) @@ -980,7 +967,7 @@ static INT32 Joy3Axis(axis_input_e axissel) } if (flp) retaxis = -retaxis; //flip it around return retaxis; - + } else { @@ -1000,7 +987,7 @@ static INT32 Joy3Axis(axis_input_e axissel) } if (flp) retaxis = -retaxis; //flip it around return retaxis; - + } } @@ -1075,7 +1062,7 @@ static INT32 Joy4Axis(axis_input_e axissel) } if (flp) retaxis = -retaxis; //flip it around return retaxis; - + } else { @@ -1095,7 +1082,7 @@ static INT32 Joy4Axis(axis_input_e axissel) } if (flp) retaxis = -retaxis; //flip it around return retaxis; - + } } @@ -1509,61 +1496,11 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) } -// User has designated that they want -// analog ON, so tell the game to stop -// fudging with it. -static void UserAnalog_OnChange(void) -{ - /*if (cv_useranalog.value) - CV_SetValue(&cv_analog, 1); - else - CV_SetValue(&cv_analog, 0);*/ -} - -static void UserAnalog2_OnChange(void) -{ - if (botingame) - return; - /*if (cv_useranalog2.value) - CV_SetValue(&cv_analog2, 1); - else - CV_SetValue(&cv_analog2, 0);*/ -} - -static void UserAnalog3_OnChange(void) -{ - if (botingame) - return; - /*if (cv_useranalog3.value) - CV_SetValue(&cv_analog3, 1); - else - CV_SetValue(&cv_analog3, 0);*/ -} - -static void UserAnalog4_OnChange(void) -{ - if (botingame) - return; - /*if (cv_useranalog4.value) - CV_SetValue(&cv_analog4, 1); - else - CV_SetValue(&cv_analog4, 0);*/ -} - static void Analog_OnChange(void) { if (!cv_cam_dist.string) return; - // cameras are not initialized at this point - - /* - if (!cv_chasecam.value && cv_analog.value) { - CV_SetValue(&cv_analog, 0); - return; - } - */ - SendWeaponPref(); } @@ -1572,15 +1509,6 @@ static void Analog2_OnChange(void) if (!(splitscreen || botingame) || !cv_cam2_dist.string) return; - // cameras are not initialized at this point - - /* - if (!cv_chasecam2.value && cv_analog2.value) { - CV_SetValue(&cv_analog2, 0); - return; - } - */ - SendWeaponPref2(); } @@ -1589,15 +1517,6 @@ static void Analog3_OnChange(void) if (splitscreen < 2 || !cv_cam3_dist.string) return; - // cameras are not initialized at this point - - /* - if (!cv_chasecam3.value && cv_analog3.value) { - CV_SetValue(&cv_analog3, 0); - return; - } - */ - SendWeaponPref3(); } @@ -1606,15 +1525,6 @@ static void Analog4_OnChange(void) if (splitscreen < 3 || !cv_cam4_dist.string) return; - // cameras are not initialized at this point - - /* - if (!cv_chasecam4.value && cv_analog4.value) { - CV_SetValue(&cv_analog4, 0); - return; - } - */ - SendWeaponPref4(); } @@ -2150,7 +2060,6 @@ void G_ResetView(UINT8 viewnum, INT32 playernum, boolean onlyactive) P_ResetCamera(&players[(*displayplayerp)], camerap); - // Make sure the viewport doesn't interpolate at all into // its new position -- just snap instantly into place. R_ResetViewInterpolation(viewd); @@ -2235,13 +2144,6 @@ void G_Ticker(boolean run) if (!(netgame || multiplayer) && G_GetRetryFlag()) { G_ClearRetryFlag(); - - // Costs a life to retry ... unless the player in question is dead already. - /*if (G_GametypeUsesLives() && players[consoleplayer].playerstate == PST_LIVE) - players[consoleplayer].lives -= 1; - - G_DoReborn(consoleplayer);*/ - D_MapChange(gamemap, gametype, cv_kartencore.value, true, 1, false, false); } @@ -3163,13 +3065,6 @@ const char *Gametype_Names[NUMGAMETYPES] = { "Race", // GT_RACE "Battle" // GT_MATCH - - /*"Co-op", // GT_COOP - "Competition", // GT_COMPETITION - "Team Match", // GT_TEAMMATCH - "Tag", // GT_TAG - "Hide and Seek", // GT_HIDEANDSEEK - "CTF" // GT_CTF*/ }; // @@ -3231,12 +3126,7 @@ boolean G_GametypeHasTeams(void) // boolean G_GametypeHasSpectators(void) { - // SRB2Kart: We don't have any exceptions to not being able to spectate yet. Maybe when SP & bots roll around. -#if 0 - return (gametype != GT_COOP && gametype != GT_COMPETITION && gametype != GT_RACE); -#else return (netgame || (multiplayer && demo.playback)); //true -#endif } // @@ -4271,14 +4161,11 @@ void G_LoadGame(UINT32 slot, INT16 mapoverride) Z_Free(savebuffer); save_p = savebuffer = NULL; -// gameaction = ga_nothing; -// G_SetGamestate(GS_LEVEL); displayplayers[0] = consoleplayer; multiplayer = false; splitscreen = 0; SplitScreen_OnChange(); // not needed? -// G_DeferedInitNew(sk_medium, G_BuildMapName(1), 0, 0, 1); if (setsizeneeded) R_ExecuteSetViewSize(); @@ -7858,9 +7745,6 @@ void G_AddGhost(char *defdemoname) case ATTACKING_RECORD: // 1 p += 8; // demo time, lap break; - /*case ATTACKING_NIGHTS: // 2 - p += 8; // demo time left, score - break;*/ default: // 3 break; } @@ -8536,7 +8420,6 @@ boolean G_DemoTitleResponder(event_t *ev) void G_SetGamestate(gamestate_t newstate) { gamestate = newstate; - #ifdef HAVE_DISCORDRPC DRPC_UpdatePresence(); #endif @@ -8609,4 +8492,3 @@ INT32 G_TicsToMilliseconds(tic_t tics) { return (INT32)((tics%TICRATE) * (1000.00f/TICRATE)); } - diff --git a/src/hu_stuff.c b/src/hu_stuff.c index 0594d28cd..ba6bb72bc 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -2801,18 +2801,6 @@ static void HU_DrawRankings(void) V_DrawCenteredString(256, 16, hilicol, va("%d", cv_pointlimit.value)); } } - /*else if (gametype == GT_COOP) - { - INT32 totalscore = 0; - for (i = 0; i < MAXPLAYERS; i++) - { - if (playeringame[i]) - totalscore += players[i].score; - } - - V_DrawCenteredString(256, 8, 0, "TOTAL SCORE"); - V_DrawCenteredString(256, 16, 0, va("%u", totalscore)); - }*/ else { if (circuitmap) @@ -2885,12 +2873,7 @@ static void HU_DrawRankings(void) #endif } - /*if (G_GametypeHasTeams()) - HU_DrawTeamTabRankings(tab, whiteplayer); //separate function for Spazzo's silly request -- gotta fix this up later - else if (scorelines > 10)*/ HU_DrawTabRankings(((scorelines > 8) ? 32 : 40), 33, tab, scorelines, whiteplayer, hilicol); - /*else - HU_DrawDualTabRankings(32, 32, tab, scorelines, whiteplayer);*/ // draw spectators in a ticker across the bottom if (netgame && G_GametypeHasSpectators()) From 6fb804292c7e50d4ccae8fce09ff63ab8cd31596 Mon Sep 17 00:00:00 2001 From: Alug Date: Mon, 16 Sep 2024 13:53:53 +0200 Subject: [PATCH 12/14] Prevent integer div by 0 in curl progress callback --- src/d_netfil.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/src/d_netfil.c b/src/d_netfil.c index 7bf862f90..9423a368d 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -1205,23 +1205,51 @@ size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream) #ifdef XFERINFOFUNCTION int curlprogress_callbackx(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) { + time_t curtime; + (void)clientp; (void)ultotal; (void)ulnow; // Function prototype requires these but we won't use, so just discard + + curtime = time(NULL); + curl_dlnow = dlnow; curl_dltotal = dltotal; - getbytes = curl_dlnow / (time(NULL) - curl_starttime); // To-do: Make this more accurate??? + + if (curtime > curl_starttime) + { + getbytes = curl_dlnow / (curtime - curl_starttime); // To-do: Make this more accurate??? + } + else + { + getbytes = 0; + } + return 0; } #else int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) { + time_t curtime; + (void)clientp; (void)ultotal; (void)ulnow; // Function prototype requires these but we won't use, so just discard + + curtime = time(NULL); + curl_dlnow = dlnow; curl_dltotal = dltotal; - getbytes = curl_dlnow / (time(NULL) - curl_starttime); // To-do: Make this more accurate??? + + if (curtime > curl_starttime) + { + getbytes = curl_dlnow / (curtime - curl_starttime); // To-do: Make this more accurate??? + } + else + { + getbytes = 0; + } + return 0; } #endif From 14ea041c72b0ffb0ce489fb04ac8e1abda5a5588 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 18 Sep 2024 12:11:04 +0200 Subject: [PATCH 13/14] always reset cam subsector regardless of splitscreen --- src/d_clisrv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index f14ba8009..f80715785 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1997,6 +1997,10 @@ static void CL_ReloadReceivedSavegame(void) for (i = 0; i <= splitscreen; i++) { localangle[i] = (angle_t)(players[displayplayers[i]].cmd.angleturn<<16); + } + + for (i = 0; i < MAXSPLITSCREENPLAYERS; i++) + { camera[i].subsector = R_PointInSubsector(camera[i].x, camera[i].y); } From f12b7fd7726ffc0e08d7b372d5d574371b7f6b85 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 19 Sep 2024 12:41:32 +0200 Subject: [PATCH 14/14] move this --- src/g_game.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 83150ea94..1242e26e6 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2456,21 +2456,6 @@ void G_PlayerReborn(INT32 player) bot = players[player].bot; pity = players[player].pity; - if (leveltime <= starttime) // man i really hope this crap works kek but need to reset this somehow at mapstart - { - for (i = 0; i < LAP__MAX; i++) - { - laptime[i] = 0; - } - } - else - { - for (i = 0; i < LAP__MAX; i++) - { - laptime[i] = players[player].laptime[i]; - } - } - // SRB2kart if (leveltime <= starttime || spectator == true) { @@ -2491,6 +2476,11 @@ void G_PlayerReborn(INT32 player) starpostnum = 0; respawnflip = 0; starpostangle = 0; + + for (i = 0; i < LAP__MAX; i++) + { + laptime[i] = 0; + } } else { @@ -2519,6 +2509,11 @@ void G_PlayerReborn(INT32 player) bumper = players[player].kartstuff[k_bumper]; comebackpoints = players[player].kartstuff[k_comebackpoints]; wanted = players[player].kartstuff[k_wanted]; + + for (i = 0; i < LAP__MAX; i++) + { + laptime[i] = players[player].laptime[i]; + } } spectatorreentry = players[player].spectatorreentry;