From 18914f22f20e204917d50824645639b6ee0418b0 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 18:29:18 +0200 Subject: [PATCH 1/6] remove crappy memcpy redifine from md5 --- src/md5.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/md5.c b/src/md5.c index 66d563666..8292fb9ee 100644 --- a/src/md5.c +++ b/src/md5.c @@ -26,12 +26,6 @@ #if defined (STDC_HEADERS) || defined (_LIBC) #include -#else - #ifndef HAVE_MEMCPY - #if !(defined (_WIN32) && !defined (__CYGWIN__)) && !defined (__APPLE__) - #define memcpy(d, s, n) bcopy ((s), (d), (n)) - #endif - #endif #endif #include "md5.h" From 346dee019ca4e7571be7baf83104e2bd43c2b17b Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 18:30:26 +0200 Subject: [PATCH 2/6] fix compiler warning bout playeringame --- src/d_clisrv.c | 14 +++++++------- src/d_netcmd.c | 7 ++----- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 9625934fc..98b4b1e55 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1693,7 +1693,7 @@ static void SV_SendPlayerInfo(INT32 node) continue; } - if (playeringame[i] == UINT8_MAX || !playeringame[i]) + if (playernode[i] == UINT8_MAX || !playeringame[i]) { netbuffer->u.playerinfo[i].node = 255; // This slot is empty. continue; @@ -5324,18 +5324,18 @@ static void HandlePacketFromPlayer(SINT8 node) /// \todo Use a separate cvar for that kind of timeout? freezetimeout[node] = I_GetTime() + connectiontimeout; - // If we've alredy received a ticcmd for this tic, just submit it for the next one. - tic_t faketic = maketic; - if ((!!(netcmds[maketic % TICQUEUE][netconsole].angleturn & TICCMD_RECEIVED)) - && (maketic - firstticstosend < TICQUEUE - 1)) - faketic++; - // Don't do anything for packets of type NODEKEEPALIVE? // Sryder 2018/07/01: Update the freezetimeout still! if (netbuffer->packettype == PT_NODEKEEPALIVE || netbuffer->packettype == PT_NODEKEEPALIVEMIS) break; + // If we've alredy received a ticcmd for this tic, just submit it for the next one. + tic_t faketic = maketic; + if ((!!(netcmds[maketic % TICQUEUE][netconsole].angleturn & TICCMD_RECEIVED)) + && (maketic - firstticstosend < TICQUEUE - 1)) + faketic++; + // Copy ticcmd G_MoveTiccmd(&netcmds[faketic%TICQUEUE][netconsole], &netbuffer->u.clientpak.cmd, 1); diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 5b8a8c18b..862ebb679 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -216,11 +216,8 @@ static CV_PossibleValue_t teamscramble_cons_t[] = {{0, "Off"}, {1, "Random"}, {2 static CV_PossibleValue_t startingliveslimit_cons_t[] = {{1, "MIN"}, {99, "MAX"}, {0, NULL}}; static CV_PossibleValue_t sleeping_cons_t[] = {{0, "MIN"}, {1000/TICRATE, "MAX"}, {0, NULL}}; -static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Teleports"}, - {3, "None"}, {0, NULL}}; - -static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Non-Random"}, - {3, "None"}, {0, NULL}}; +static CV_PossibleValue_t competitionboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Teleports"}, {3, "None"}, {0, NULL}}; +static CV_PossibleValue_t matchboxes_cons_t[] = {{0, "Normal"}, {1, "Random"}, {2, "Non-Random"}, {3, "None"}, {0, NULL}}; //static CV_PossibleValue_t chances_cons_t[] = {{0, "MIN"}, {9, "MAX"}, {0, NULL}}; static CV_PossibleValue_t match_scoring_cons_t[] = {{0, "Normal"}, {1, "Classic"}, {0, NULL}}; From 19e5366c5bef6d2b98825a3fbc1847d614b2fa94 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 18:31:21 +0200 Subject: [PATCH 3/6] add wireframe mode for ogl --- src/hardware/hw_main.c | 20 ++++++++++++++++++-- src/hardware/hw_main.h | 2 ++ src/hardware/r_opengl/r_opengl.c | 7 +++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c index 94767ff5d..0f308017d 100644 --- a/src/hardware/hw_main.c +++ b/src/hardware/hw_main.c @@ -226,6 +226,8 @@ consvar_t cv_glsolvetjoin = {"gr_solvetjoin", "On", 0, CV_OnOff, NULL, 0, NULL, consvar_t cv_glbatching = {"gr_batching", "On", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_glwireframe = {"gr_wireframe", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; + consvar_t cv_glrenderdistance = {"gr_renderdistance", "Max", CV_SAVE, glrenderdistance_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_glhorizonlines = {"gr_horizonlines", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -338,6 +340,12 @@ static void HWR_SetShaderState(void) GL_SetSpecialState(HWD_SET_SHADERS, HWR_UseShader() ? 1 : 0); } + +static boolean HWR_IsWireframeMode(void) +{ + return (cv_glwireframe.value /*&& cv_debug*/); +} + static boolean HWR_OverrideObjectLightLevel(mobj_t *thing, INT32 *lightlevel) { if (R_ThingIsFullBright(thing)) @@ -5259,6 +5267,9 @@ static void HWR_DrawSkyBackground(void) if (drewsky) return; + if (HWR_IsWireframeMode()) + return; + GL_SetBlend(PF_Translucent|PF_NoDepthTest|PF_Modulated); memcpy(&dometransform, &atransform, sizeof(FTransform)); @@ -5461,8 +5472,8 @@ void HWR_RenderViewpoint(gl_portal_t *rootportal, const float fpov, player_t *pl HWR_PortalClipping(rootportal); } - // Set transform. - GL_SetTransform(&atransform); + if (HWR_IsWireframeMode()) + GL_SetSpecialState(HWD_SET_WIREFRAME, 1); ps_numbspcalls.value.i = 0; ps_numpolyobjects.value.i = 0; @@ -5527,6 +5538,9 @@ void HWR_RenderViewpoint(gl_portal_t *rootportal, const float fpov, player_t *pl ps_hw_nodedrawtime.value.p = 0; HWR_RenderDrawNodes(); + if (HWR_IsWireframeMode()) + GL_SetSpecialState(HWD_SET_WIREFRAME, 0); + HWR_FreePortalList(portallist); } @@ -5801,6 +5815,8 @@ void HWR_AddCommands(void) CV_RegisterVar(&cv_glbatching); + CV_RegisterVar(&cv_glwireframe); + CV_RegisterVar(&cv_glrenderdistance); CV_RegisterVar(&cv_glhorizonlines); diff --git a/src/hardware/hw_main.h b/src/hardware/hw_main.h index b8d6ef939..87b1faaf4 100644 --- a/src/hardware/hw_main.h +++ b/src/hardware/hw_main.h @@ -202,6 +202,8 @@ extern consvar_t cv_glsolvetjoin; extern consvar_t cv_glbatching; +extern consvar_t cv_glwireframe; + extern consvar_t cv_glrenderdistance; extern consvar_t cv_glhorizonlines; diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 12ec0cd97..07ceaf86f 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -350,6 +350,8 @@ typedef void (APIENTRY * PFNglDisable) (GLenum cap); static PFNglDisable pglDisable; typedef void (APIENTRY * PFNglGetFloatv) (GLenum pname, GLfloat *params); static PFNglGetFloatv pglGetFloatv; +typedef void (APIENTRY * PFNglPolygonMode) (GLenum, GLenum); +static PFNglPolygonMode pglPolygonMode; /* Depth Buffer */ typedef void (APIENTRY * PFNglClearDepth) (GLclampd depth); @@ -549,6 +551,7 @@ boolean SetupGLfunc(void) GETOPENGLFUNC(pglGetFloatv, glGetFloatv) GETOPENGLFUNC(pglGetIntegerv, glGetIntegerv) GETOPENGLFUNC(pglGetString, glGetString) + GETOPENGLFUNC(pglPolygonMode, glPolygonMode) GETOPENGLFUNC(pglClearDepth, glClearDepth) GETOPENGLFUNC(pglDepthFunc, glDepthFunc) @@ -2364,6 +2367,10 @@ void GL_SetSpecialState(hwdspecialstate_t IdState, INT32 Value) GL_Flush(); //??? if we want to change filter mode by texture, remove this break; + case HWD_SET_WIREFRAME: + pglPolygonMode(GL_FRONT_AND_BACK, Value ? GL_LINE : GL_FILL); + break; + case HWD_SET_TEXTURE_FORMAT: gltexformat = (Value == 32) ? GL_RGBA : GL_RGB5_A1; GL_Flush(); From f15d3be263cad5ee319646cad281ef89283ac730 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 16:37:37 +0100 Subject: [PATCH 4/6] forgor the hw state lel --- src/hardware/hw_defs.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hardware/hw_defs.h b/src/hardware/hw_defs.h index 08cce42c9..1da42770a 100644 --- a/src/hardware/hw_defs.h +++ b/src/hardware/hw_defs.h @@ -318,6 +318,8 @@ enum hwdsetspecialstate HWD_SET_TEXTUREFILTERMODE, HWD_SET_TEXTUREANISOTROPICMODE, + HWD_SET_WIREFRAME, + HWD_SET_MSAA, HWD_SET_SCREEN_TEXTURES, From ff474d18ee6a6c67ae315b55eba3b0177474f008 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 21:42:13 +0200 Subject: [PATCH 5/6] remove this prob wrong assumption, our netcode sucks massive ass --- src/d_clisrv.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 98b4b1e55..712cf8dc8 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1687,13 +1687,7 @@ static void SV_SendPlayerInfo(INT32 node) for (i = 0; i < MSCOMPAT_MAXPLAYERS; i++) { - if (i >= MAXPLAYERS) - { - netbuffer->u.playerinfo[i].node = 255; - continue; - } - - if (playernode[i] == UINT8_MAX || !playeringame[i]) + if ((i >= MAXPLAYERS) || !playeringame[i]) { netbuffer->u.playerinfo[i].node = 255; // This slot is empty. continue; From a6898bd1cd8c091e356d22dd8fec91559c35f991 Mon Sep 17 00:00:00 2001 From: Alug Date: Wed, 28 May 2025 22:11:46 +0200 Subject: [PATCH 6/6] this memset is incorrect and does nothing --- src/d_clisrv.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 712cf8dc8..4e5a1cd9a 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -1068,6 +1068,7 @@ static void SV_RequireResynch(INT32 node) // Initial setup memset(resynch_sent[node], 0, MAXPLAYERS); + for (i = 0; i < MAXPLAYERS; ++i) { if (!playeringame[i]) // Player not in game so just drop it from required synch @@ -1772,8 +1773,6 @@ static boolean SV_SendServerConfig(INT32 node) memset(netbuffer->u.servercfg.playerskins, 0xFF, sizeof(netbuffer->u.servercfg.playerskins)); memset(netbuffer->u.servercfg.playercolor, 0xFF, sizeof(netbuffer->u.servercfg.playercolor)); - memset(netbuffer->u.servercfg.adminplayers, -1, sizeof(netbuffer->u.servercfg.adminplayers)); - for (i = 0; i < MAXPLAYERS; i++) { netbuffer->u.servercfg.adminplayers[i] = (SINT8)adminplayers[i]; @@ -3269,7 +3268,7 @@ void CL_ClearPlayer(INT32 playernum) P_RemoveMobj(players[playernum].mo); } - memset(&players[playernum], 0, sizeof (player_t)); + memset(&players[playernum], 0, sizeof(player_t)); } // @@ -4278,14 +4277,14 @@ void SV_ResetServer(void) sprintf(player_names[i], "Player %d", i + 1); } - memset(player_name_changes, 0, sizeof player_name_changes); + memset(player_name_changes, 0, sizeof(player_name_changes)); - memset(playeringame, false, sizeof playeringame); - memset(playernode, UINT8_MAX, sizeof playernode); + memset(playeringame, false, sizeof(playeringame)); + memset(playernode, UINT8_MAX, sizeof(playernode)); pingmeasurecount = 1; - memset(realpingtable, 0, sizeof realpingtable); - memset(playerpingtable, 0, sizeof playerpingtable); + memset(realpingtable, 0, sizeof(realpingtable)); + memset(playerpingtable, 0, sizeof(playerpingtable)); ClearAdminPlayers();