From ba91520eab98474c949c6937523bad2bb98b2fc3 Mon Sep 17 00:00:00 2001
From: LJ Sonic <lamr@free.fr>
Date: Fri, 30 Dec 2022 00:24:06 +0100
Subject: [PATCH] Remove useless return value for SV_AddWaitingPlayers
---
src/d_clisrv.c | 12 +++---------
src/d_clisrv.h | 2 +-
src/d_netcmd.c | 3 +--
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 1b344a0de9..0c6960236c 100755
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -3262,9 +3262,9 @@ static void Got_AddPlayer(UINT8 **p, INT32 playernum)
LUA_HookInt(newplayernum, HOOK(PlayerJoin));
}
-static boolean SV_AddWaitingPlayers(const char *name, const char *name2)
+static void SV_AddWaitingPlayers(const char *name, const char *name2)
{
- INT32 node, n, newplayer = false;
+ INT32 node, n;
UINT8 buf[2 + MAXPLAYERNAME];
UINT8 *p;
INT32 newplayernum;
@@ -3274,8 +3274,6 @@ static boolean SV_AddWaitingPlayers(const char *name, const char *name2)
// splitscreen can allow 2 player in one node
for (; netnodes[node].numplayerswaiting > 0; netnodes[node].numplayerswaiting--)
{
- newplayer = true;
-
newplayernum = FindRejoinerNum(node);
if (newplayernum == -1)
{
@@ -3320,8 +3318,6 @@ static boolean SV_AddWaitingPlayers(const char *name, const char *name2)
DEBFILE(va("Server added player %d node %d\n", newplayernum, node));
}
}
-
- return newplayer;
}
void CL_AddSplitscreenPlayer(void)
@@ -3344,7 +3340,7 @@ boolean Playing(void)
return (server && serverrunning) || (client && cl_mode == CL_CONNECTED);
}
-boolean SV_SpawnServer(void)
+void SV_SpawnServer(void)
{
if (demoplayback)
G_StopDemo(); // reset engine parameter
@@ -3371,8 +3367,6 @@ boolean SV_SpawnServer(void)
CL_ConnectToServer();
else doomcom->numslots = 1;
}
-
- return SV_AddWaitingPlayers(cv_playername.zstring, cv_playername2.zstring);
}
void SV_StopServer(void)
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index e078641224..b3ee95c0cc 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -412,7 +412,7 @@ void SendKick(UINT8 playernum, UINT8 msg);
void NetUpdate(void);
void SV_StartSinglePlayerServer(void);
-boolean SV_SpawnServer(void);
+void SV_SpawnServer(void);
void SV_StopServer(void);
void SV_ResetServer(void);
void CL_AddSplitscreenPlayer(void);
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 5f02bc2dea..243501ba4c 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1850,8 +1850,7 @@ void D_MapChange(INT32 mapnum, INT32 newgametype, boolean pultmode, boolean rese
// reset players if there is a new one
if (!IsPlayerAdmin(consoleplayer))
{
- if (SV_SpawnServer())
- buf[0] &= ~(1<<1);
+ SV_SpawnServer();
if (!Playing()) // you failed to start a server somehow, so cancel the map change
return;
}
--
GitLab