From bf8a39f7eedcf8011e3f19015d22bdde9b3e7589 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 11 Jan 2020 15:40:18 -0800
Subject: [PATCH 01/13] Only exit if base files fail to load
---
src/w_wad.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/w_wad.c b/src/w_wad.c
index bbb30d3fa..cfd2db50e 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -822,13 +822,11 @@ UINT16 W_InitFile(const char *filename, boolean mainfile)
* backwards, so a later file overrides all earlier ones.
*
* \param filenames A null-terminated list of files to use.
- * \return 1 if all files were loaded, 0 if at least one was missing or
+ * \return 1 if base files were loaded, 0 if at least one was missing or
* invalid.
*/
INT32 W_InitMultipleFiles(char **filenames, UINT16 mainfiles)
{
- INT32 rc = 1;
-
// open all the files, load headers, and count lumps
numwadfiles = 0;
@@ -836,13 +834,15 @@ INT32 W_InitMultipleFiles(char **filenames, UINT16 mainfiles)
for (; *filenames; filenames++)
{
//CONS_Debug(DBG_SETUP, "Loading %s\n", *filenames);
- rc &= (W_InitFile(*filenames, numwadfiles < mainfiles) != INT16_MAX) ? 1 : 0;
+ if (W_InitFile(*filenames, numwadfiles < mainfiles) == INT16_MAX)
+ {
+ CONS_Printf(M_GetText("Errors occurred while loading %s; not added.\n"), *filenames);
+ if (numwadfiles < mainfiles)
+ return 0;
+ }
}
- if (!numwadfiles)
- I_Error("W_InitMultipleFiles: no files found");
-
- return rc;
+ return 1;
}
/** Make sure a lump number is valid.
From d08929b3d77d9e5686abddf8e07c0b2cdd927949 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sun, 26 Jan 2020 22:46:57 -0300
Subject: [PATCH 02/13] Move line drawer setting to AM_Drawer
---
src/am_map.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/am_map.c b/src/am_map.c
index 7dfbf4ba4..0f8f0f74f 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -354,12 +354,6 @@ static void AM_LevelInit(void)
f_w = vid.width;
f_h = vid.height;
- AM_drawFline = AM_drawFline_soft;
-#ifdef HWRENDER
- if (rendermode == render_opengl)
- AM_drawFline = HWR_drawAMline;
-#endif
-
AM_findMinMaxBoundaries();
scale_mtof = FixedDiv(min_scale_mtof*10, 7*FRACUNIT);
if (scale_mtof > max_scale_mtof)
@@ -1100,6 +1094,12 @@ void AM_Drawer(void)
if (!automapactive)
return;
+ AM_drawFline = AM_drawFline_soft;
+#ifdef HWRENDER
+ if (rendermode == render_opengl)
+ AM_drawFline = HWR_drawAMline;
+#endif
+
AM_clearFB(BACKGROUND);
if (draw_grid) AM_drawGrid(GRIDCOLORS);
AM_drawWalls();
From ba6018aea44ec6cdf0245acb116deec64a5941fa Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sun, 26 Jan 2020 22:52:15 -0300
Subject: [PATCH 03/13] Optimise pixel drawing
---
src/am_map.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/am_map.c b/src/am_map.c
index 0f8f0f74f..c06bd2561 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -205,6 +205,7 @@ static boolean followplayer = true; // specifies whether to follow the player ar
typedef void (*AMDRAWFLINEFUNC) (const fline_t *fl, INT32 color);
static AMDRAWFLINEFUNC AM_drawFline;
+static void AM_drawPixel(INT32 xx, INT32 yy, INT32 cc);
static void AM_drawFline_soft(const fline_t *fl, INT32 color);
static void AM_activateNewScale(void)
@@ -712,6 +713,17 @@ static boolean AM_clipMline(const mline_t *ml, fline_t *fl)
}
#undef DOOUTCODE
+//
+// Draws a pixel.
+//
+static void AM_drawPixel(INT32 xx, INT32 yy, INT32 cc)
+{
+ UINT8 *dest = screens[0];
+ if (xx < 0 || yy < 0 || xx >= vid.width || yy >= vid.height)
+ return; // off the screen
+ dest[(yy*vid.rowbytes) + (xx * vid.bpp)] = (cc & 0xFF);
+}
+
//
// Classic Bresenham w/ whatever optimizations needed for speed
//
@@ -733,8 +745,6 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
}
#endif
- #define PUTDOT(xx,yy,cc) V_DrawFill(xx,yy,1,1,cc|V_NOSCALESTART);
-
dx = fl->b.x - fl->a.x;
ax = 2 * (dx < 0 ? -dx : dx);
sx = dx < 0 ? -1 : 1;
@@ -751,7 +761,7 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
d = ay - ax/2;
for (;;)
{
- PUTDOT(x, y, color)
+ AM_drawPixel(x, y, color);
if (x == fl->b.x)
return;
if (d >= 0)
@@ -768,7 +778,7 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
d = ax - ay/2;
for (;;)
{
- PUTDOT(x, y, color)
+ AM_drawPixel(x, y, color);
if (y == fl->b.y)
return;
if (d >= 0)
@@ -780,8 +790,6 @@ static void AM_drawFline_soft(const fline_t *fl, INT32 color)
d += ax;
}
}
-
- #undef PUTDOT
}
//
From dd8166ca5f4f9dce7a4189a7e89992e42e0cbf9d Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sun, 26 Jan 2020 22:57:14 -0300
Subject: [PATCH 04/13] Doesn't matter.
---
src/am_map.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/am_map.c b/src/am_map.c
index c06bd2561..4ad40b7aa 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -721,7 +721,7 @@ static void AM_drawPixel(INT32 xx, INT32 yy, INT32 cc)
UINT8 *dest = screens[0];
if (xx < 0 || yy < 0 || xx >= vid.width || yy >= vid.height)
return; // off the screen
- dest[(yy*vid.rowbytes) + (xx * vid.bpp)] = (cc & 0xFF);
+ dest[(yy*vid.width) + xx] = cc;
}
//
From 8f3855d09f93da34fbe56fe62b90c36c283f65ec Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sun, 26 Jan 2020 23:12:28 -0300
Subject: [PATCH 05/13] Don't stop the automap (just restart it instead.)
---
src/am_map.c | 24 +++++++++++++++++-------
src/am_map.h | 3 +++
src/screen.c | 7 +++++--
3 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/am_map.c b/src/am_map.c
index 4ad40b7aa..6cd9a3f0f 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -345,16 +345,22 @@ static void AM_initVariables(void)
old_m_h = m_h;
}
+//
+// Called when the screen size changed.
+//
+static void AM_FrameBufferInit(void)
+{
+ f_x = f_y = 0;
+ f_w = vid.width;
+ f_h = vid.height;
+}
+
//
// should be called at the start of every level
// right now, i figure it out myself
//
static void AM_LevelInit(void)
{
- f_x = f_y = 0;
- f_w = vid.width;
- f_h = vid.height;
-
AM_findMinMaxBoundaries();
scale_mtof = FixedDiv(min_scale_mtof*10, 7*FRACUNIT);
if (scale_mtof > max_scale_mtof)
@@ -376,7 +382,7 @@ void AM_Stop(void)
*
* \sa AM_Stop
*/
-static inline void AM_Start(void)
+void AM_Start(void)
{
static INT32 lastlevel = -1;
@@ -385,8 +391,12 @@ static inline void AM_Start(void)
am_stopped = false;
if (lastlevel != gamemap || am_recalc) // screen size changed
{
- AM_LevelInit();
- lastlevel = gamemap;
+ AM_FrameBufferInit();
+ if (lastlevel != gamemap)
+ {
+ AM_LevelInit();
+ lastlevel = gamemap;
+ }
am_recalc = false;
}
AM_initVariables();
diff --git a/src/am_map.h b/src/am_map.h
index 462bb3d6d..0560207bb 100644
--- a/src/am_map.h
+++ b/src/am_map.h
@@ -38,6 +38,9 @@ void AM_Ticker(void);
// Called by main loop, instead of view drawer if automap is active.
void AM_Drawer(void);
+// Enables the automap.
+void AM_Start(void);
+
// Called to force the automap to quit if the level is completed while it is up.
void AM_Stop(void);
diff --git a/src/screen.c b/src/screen.c
index 5bb304c08..fcf6c6b0b 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -360,10 +360,13 @@ void SCR_Recalc(void)
vid.fsmalldupy = vid.smalldupy*FRACUNIT;
#endif
- // toggle off automap because some screensize-dependent values will
+ // toggle off (then back on) the automap because some screensize-dependent values will
// be calculated next time the automap is activated.
if (automapactive)
- AM_Stop();
+ {
+ am_recalc = true;
+ AM_Start();
+ }
// set the screen[x] ptrs on the new vidbuffers
V_Init();
From 2cfeaa63d2e8262dec715748132cb29fac834334 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sun, 26 Jan 2020 23:34:04 -0300
Subject: [PATCH 06/13] Fix movement to accomodate to window scale changes
---
src/am_map.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 61 insertions(+), 6 deletions(-)
diff --git a/src/am_map.c b/src/am_map.c
index 6cd9a3f0f..b1fad1b0c 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -160,6 +160,7 @@ static boolean am_stopped = true;
static INT32 f_x, f_y; // location of window on screen (always zero for both)
static INT32 f_w, f_h; // size of window on screen (always the screen width and height respectively)
+static boolean m_keydown[4]; // which window panning keys are being pressed down?
static mpoint_t m_paninc; // how far the window pans each tic (map coords)
static fixed_t mtof_zoommul; // how far the window zooms in each tic (map coords)
static fixed_t ftom_zoommul; // how far the window zooms in each tic (fb coords)
@@ -422,6 +423,28 @@ static void AM_maxOutWindowScale(void)
AM_activateNewScale();
}
+//
+// set window panning
+//
+static void AM_setWindowPanning(void)
+{
+ // up and down
+ if (m_keydown[2]) // pan up
+ m_paninc.y = FTOM(F_PANINC);
+ else if (m_keydown[3]) // pan down
+ m_paninc.y = -FTOM(F_PANINC);
+ else
+ m_paninc.y = 0;
+
+ // left and right
+ if (m_keydown[0]) // pan right
+ m_paninc.x = FTOM(F_PANINC);
+ else if (m_keydown[1]) // pan left
+ m_paninc.x = -FTOM(F_PANINC);
+ else
+ m_paninc.x = 0;
+}
+
/** Responds to user inputs in automap mode.
*
* \param ev Event to possibly respond to.
@@ -454,35 +477,49 @@ boolean AM_Responder(event_t *ev)
{
case AM_PANRIGHTKEY: // pan right
if (!followplayer)
- m_paninc.x = FTOM(F_PANINC);
+ {
+ m_keydown[0] = true;
+ AM_setWindowPanning();
+ }
else
rc = false;
break;
case AM_PANLEFTKEY: // pan left
if (!followplayer)
- m_paninc.x = -FTOM(F_PANINC);
+ {
+ m_keydown[1] = true;
+ AM_setWindowPanning();
+ }
else
rc = false;
break;
case AM_PANUPKEY: // pan up
if (!followplayer)
- m_paninc.y = FTOM(F_PANINC);
+ {
+ m_keydown[2] = true;
+ AM_setWindowPanning();
+ }
else
rc = false;
break;
case AM_PANDOWNKEY: // pan down
if (!followplayer)
- m_paninc.y = -FTOM(F_PANINC);
+ {
+ m_keydown[3] = true;
+ AM_setWindowPanning();
+ }
else
rc = false;
break;
case AM_ZOOMOUTKEY: // zoom out
mtof_zoommul = M_ZOOMOUT;
ftom_zoommul = M_ZOOMIN;
+ AM_setWindowPanning();
break;
case AM_ZOOMINKEY: // zoom in
mtof_zoommul = M_ZOOMIN;
ftom_zoommul = M_ZOOMOUT;
+ AM_setWindowPanning();
break;
case AM_TOGGLEKEY:
AM_Stop();
@@ -515,14 +552,32 @@ boolean AM_Responder(event_t *ev)
switch (ev->data1)
{
case AM_PANRIGHTKEY:
+ if (!followplayer)
+ {
+ m_keydown[0] = false;
+ AM_setWindowPanning();
+ }
+ break;
case AM_PANLEFTKEY:
if (!followplayer)
- m_paninc.x = 0;
+ {
+ m_keydown[1] = false;
+ AM_setWindowPanning();
+ }
break;
case AM_PANUPKEY:
+ if (!followplayer)
+ {
+ m_keydown[2] = false;
+ AM_setWindowPanning();
+ }
+ break;
case AM_PANDOWNKEY:
if (!followplayer)
- m_paninc.y = 0;
+ {
+ m_keydown[3] = false;
+ AM_setWindowPanning();
+ }
break;
case AM_ZOOMOUTKEY:
case AM_ZOOMINKEY:
From 46cbe63b43f9cd3b4958c1c911907b4e6b9a6aa0 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sun, 26 Jan 2020 23:39:31 -0300
Subject: [PATCH 07/13] Fix going big
---
src/am_map.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/am_map.c b/src/am_map.c
index b1fad1b0c..f6bafe33b 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -533,6 +533,7 @@ boolean AM_Responder(event_t *ev)
}
else
AM_restoreScaleAndLoc();
+ AM_setWindowPanning();
break;
case AM_FOLLOWKEY:
followplayer = !followplayer;
From 7f57327ff7b806e3aa118c745df142c187d75fc5 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sun, 26 Jan 2020 23:41:34 -0300
Subject: [PATCH 08/13] "changes" not "changed"
---
src/am_map.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/am_map.c b/src/am_map.c
index f6bafe33b..b2c7de442 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -347,7 +347,7 @@ static void AM_initVariables(void)
}
//
-// Called when the screen size changed.
+// Called when the screen size changes.
//
static void AM_FrameBufferInit(void)
{
From 636093a59ddd95b25d79c4ebff51dc6412de1956 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Mon, 27 Jan 2020 13:55:13 -0300
Subject: [PATCH 09/13] Fix color LUT using the wrong palette
---
src/m_anigif.c | 18 +++++-------------
src/r_data.c | 12 ++++++++----
src/r_data.h | 3 ++-
src/v_video.c | 3 +--
src/v_video.h | 5 +----
5 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 32fc2746d..f062bc826 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -624,14 +624,6 @@ static void GIF_framewrite(void)
//
INT32 GIF_open(const char *filename)
{
-#if 0
- if (rendermode != render_soft)
- {
- CONS_Alert(CONS_WARNING, M_GetText("GIFs cannot be taken in non-software modes!\n"));
- return 0;
- }
-#endif
-
gif_out = fopen(filename, "wb");
if (!gif_out)
return 0;
@@ -640,13 +632,13 @@ INT32 GIF_open(const char *filename)
gif_downscale = (!!cv_gif_downscale.value);
// GIF color table
- // In hardware mode, uses the master palette
- gif_palette = ((cv_screenshot_colorprofile.value
+ // In hardware mode, forces the local palette
#ifdef HWRENDER
- && (rendermode == render_soft)
+ if (rendermode == render_opengl)
+ gif_palette = pLocalPalette;
+ else
#endif
- ) ? pLocalPalette
- : pMasterPalette);
+ gif_palette = ((cv_screenshot_colorprofile.value) ? pLocalPalette : pMasterPalette);
GIF_headwrite();
gif_frames = 0;
diff --git a/src/r_data.c b/src/r_data.c
index 9f80e257b..e0a3d48d4 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -2465,16 +2465,20 @@ extracolormap_t *R_AddColormaps(extracolormap_t *exc_augend, extracolormap_t *ex
// Thanks to quake2 source!
// utils3/qdata/images.c
-UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b)
+UINT8 NearestPaletteColor(UINT8 r, UINT8 g, UINT8 b, RGBA_t *palette)
{
int dr, dg, db;
int distortion, bestdistortion = 256 * 256 * 4, bestcolor = 0, i;
+ // Use master palette if none specified
+ if (palette == NULL)
+ palette = pMasterPalette;
+
for (i = 0; i < 256; i++)
{
- dr = r - pMasterPalette[i].s.red;
- dg = g - pMasterPalette[i].s.green;
- db = b - pMasterPalette[i].s.blue;
+ dr = r - palette[i].s.red;
+ dg = g - palette[i].s.green;
+ db = b - palette[i].s.blue;
distortion = dr*dr + dg*dg + db*db;
if (distortion < bestdistortion)
{
diff --git a/src/r_data.h b/src/r_data.h
index f028f2f5d..145f0182b 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -171,7 +171,8 @@ const char *R_NameForColormap(extracolormap_t *extra_colormap);
#define R_PutRgbaRGB(r, g, b) (R_PutRgbaR(r) + R_PutRgbaG(g) + R_PutRgbaB(b))
#define R_PutRgbaRGBA(r, g, b, a) (R_PutRgbaRGB(r, g, b) + R_PutRgbaA(a))
-UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
+UINT8 NearestPaletteColor(UINT8 r, UINT8 g, UINT8 b, RGBA_t *palette);
+#define NearestColor(r, g, b) NearestPaletteColor(r, g, b, NULL)
extern INT32 numtextures;
diff --git a/src/v_video.c b/src/v_video.c
index 4785a1541..81625ff9e 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -3244,7 +3244,6 @@ Unoptimized version
#endif
}
-// Taken from my videos-in-SRB2 project
// Generates a color look-up table
// which has up to 64 colors at each channel
// (see the defines in v_video.h)
@@ -3261,7 +3260,7 @@ void InitColorLUT(RGBA_t *palette)
for (r = 0; r < CLUTSIZE; r++)
for (g = 0; g < CLUTSIZE; g++)
for (b = 0; b < CLUTSIZE; b++)
- colorlookup[r][g][b] = NearestColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS);
+ colorlookup[r][g][b] = NearestPaletteColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS, palette);
clutinit = true;
lastpalette = palette;
}
diff --git a/src/v_video.h b/src/v_video.h
index eb75a414f..bc19f6e99 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -37,10 +37,7 @@ cv_allcaps;
// Allocates buffer screens, call before R_Init.
void V_Init(void);
-// Taken from my videos-in-SRB2 project
-// Generates a color look-up table
-// which has up to 64 colors at each channel
-
+// Color look-up table
#define COLORBITS 6
#define SHIFTCOLORBITS (8-COLORBITS)
#define CLUTSIZE (1<<COLORBITS)
From 3afc766f5e36d094395fe0da41e7142be070e8c1 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 30 Jan 2020 23:58:35 -0800
Subject: [PATCH 10/13] Oops
---
src/console.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/console.c b/src/console.c
index ba5ba71df..8746bf036 100644
--- a/src/console.c
+++ b/src/console.c
@@ -769,7 +769,7 @@ boolean CON_Responder(event_t *ev)
// check for console toggle key
if (ev->type != ev_console)
{
- if (modeattacking || metalrecording || menuactive)
+ if (modeattacking || metalrecording)
return false;
if (key == gamecontrol[gc_console][0] || key == gamecontrol[gc_console][1])
From ab8eed6efbaabfb248c857b17d03d07a817d1345 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 1 Feb 2020 18:10:58 -0800
Subject: [PATCH 11/13] Add missing conditions to CleanupPlayerName
---
src/d_netcmd.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 23ec00b2e..b74a8a76d 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1010,6 +1010,17 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
tmpname = p;
+ do
+ {
+ /* from EnsurePlayerNameIsGood */
+ if (!isprint(*p) || *p == ';' || (UINT8)*p >= 0x80)
+ break;
+ }
+ while (*++p) ;
+
+ if (*p)/* bad char found */
+ break;
+
// Remove trailing spaces.
p = &tmpname[strlen(tmpname)-1]; // last character
while (*p == ' ' && p >= tmpname)
From bf3b7fc5b03298cee514ab7e190de5bef99f614f Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 1 Feb 2020 18:20:35 -0800
Subject: [PATCH 12/13] Clean player name before joining!!!
---
src/d_clisrv.c | 6 ++++++
src/d_netcmd.c | 2 +-
src/d_netcmd.h | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 704fc0901..bcae17aa3 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1275,8 +1275,14 @@ static boolean CL_SendJoin(void)
netbuffer->u.clientcfg.localplayers = localplayers;
netbuffer->u.clientcfg.version = VERSION;
netbuffer->u.clientcfg.subversion = SUBVERSION;
+
+ CleanupPlayerName(consoleplayer, cv_playername.zstring);
+ if (splitscreen)
+ CleanupPlayerName(1, cv_playername2.zstring);/* 1 is a HACK? oh no */
+
strncpy(netbuffer->u.clientcfg.names[0], cv_playername.zstring, MAXPLAYERNAME);
strncpy(netbuffer->u.clientcfg.names[1], cv_playername2.zstring, MAXPLAYERNAME);
+
return HSendPacket(servernode, true, 0, sizeof (clientconfig_pak));
}
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index b74a8a76d..cfd2162c5 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -982,7 +982,7 @@ boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
* SetPlayerName
* \author Graue <graue@oceanbase.org>
*/
-static void CleanupPlayerName(INT32 playernum, const char *newname)
+void CleanupPlayerName(INT32 playernum, const char *newname)
{
char *buf;
char *p;
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 8f857c6db..f258cde62 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -194,6 +194,7 @@ typedef union {
// add game commands, needs cleanup
void D_RegisterServerCommands(void);
void D_RegisterClientCommands(void);
+void CleanupPlayerName(INT32 playernum, const char *newname);
boolean EnsurePlayerNameIsGood(char *name, INT32 playernum);
void D_SendPlayerConfig(void);
void Command_ExitGame_f(void);
From d5ced42f06e9b75807b93a4c490ac69211bfc71c Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 1 Feb 2020 18:22:03 -0800
Subject: [PATCH 13/13] Remove Player 0
---
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 cfd2162c5..35f23ab27 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -624,7 +624,7 @@ void D_RegisterClientCommands(void)
// Set default player names
// Monster Iestyn (12/08/19): not sure where else I could have actually put this, but oh well
for (i = 0; i < MAXPLAYERS; i++)
- sprintf(player_names[i], "Player %d", i);
+ sprintf(player_names[i], "Player %d", 1 + i);
if (dedicated)
return;