From 7240ed22de0260e7f1a9ea0fcc1118b166d63c11 Mon Sep 17 00:00:00 2001
From: LJ Sonic <lamr@free.fr>
Date: Sat, 7 Jan 2023 15:57:17 +0100
Subject: [PATCH] Add missing PT_ prefix to a few packet handlers
---
src/netcode/client_connection.c | 4 ++--
src/netcode/client_connection.h | 2 +-
src/netcode/d_clisrv.c | 12 ++++++------
src/netcode/server_connection.c | 2 +-
src/netcode/server_connection.h | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/netcode/client_connection.c b/src/netcode/client_connection.c
index a00157a500..bed445a644 100644
--- a/src/netcode/client_connection.c
+++ b/src/netcode/client_connection.c
@@ -1052,7 +1052,7 @@ void CL_ConnectToServer(void)
* \note What happens if the packet comes from a client or something like that?
*
*/
-void HandleServerInfo(SINT8 node)
+void PT_ServerInfo(SINT8 node)
{
// compute ping in ms
const tic_t ticnow = I_GetTime();
@@ -1173,7 +1173,7 @@ void PT_ServerCFG(SINT8 node)
/// \note Wait. What if a Lua script uses some global custom variables synched with the NetVars hook?
/// Shouldn't them be downloaded even at intermission time?
- /// Also, according to HandleConnect, the server will send the savegame even during intermission...
+ /// Also, according to PT_Connect, the server will send the savegame even during intermission...
if (netbuffer->u.servercfg.gamestate == GS_LEVEL/* ||
netbuffer->u.servercfg.gamestate == GS_INTERMISSION*/)
cl_mode = CL_DOWNLOADSAVEGAME;
diff --git a/src/netcode/client_connection.h b/src/netcode/client_connection.h
index a76411ba64..74cff61fff 100644
--- a/src/netcode/client_connection.h
+++ b/src/netcode/client_connection.h
@@ -53,7 +53,7 @@ void CL_UpdateServerList(boolean internetsearch, INT32 room);
void CL_ConnectToServer(void);
boolean CL_SendJoin(void);
-void HandleServerInfo(SINT8 node);
+void PT_ServerInfo(SINT8 node);
void PT_MoreFilesNeeded(SINT8 node);
void PT_ServerRefuse(SINT8 node);
void PT_ServerCFG(SINT8 node);
diff --git a/src/netcode/d_clisrv.c b/src/netcode/d_clisrv.c
index 0b1c487d86..4589c83d3e 100644
--- a/src/netcode/d_clisrv.c
+++ b/src/netcode/d_clisrv.c
@@ -1358,7 +1358,7 @@ void SV_StartSinglePlayerServer(void)
* \param node The packet sender (should be the server)
*
*/
-static void HandleShutdown(SINT8 node)
+static void PT_Shutdown(SINT8 node)
{
(void)node;
LUA_HookBool(false, HOOK(GameQuit));
@@ -1373,7 +1373,7 @@ static void HandleShutdown(SINT8 node)
* \param node The packet sender (should be the server)
*
*/
-static void HandleTimeout(SINT8 node)
+static void PT_Timeout(SINT8 node)
{
(void)node;
LUA_HookBool(false, HOOK(GameQuit));
@@ -1608,26 +1608,26 @@ void GetPackets(void)
if (netbuffer->packettype == PT_CLIENTJOIN && server)
{
- HandleConnect(node);
+ PT_Connect(node);
continue;
}
if (node == servernode && client && cl_mode != CL_SEARCHING)
{
if (netbuffer->packettype == PT_SERVERSHUTDOWN)
{
- HandleShutdown(node);
+ PT_Shutdown(node);
continue;
}
if (netbuffer->packettype == PT_NODETIMEOUT)
{
- HandleTimeout(node);
+ PT_Timeout(node);
continue;
}
}
if (netbuffer->packettype == PT_SERVERINFO)
{
- HandleServerInfo(node);
+ PT_ServerInfo(node);
continue;
}
diff --git a/src/netcode/server_connection.c b/src/netcode/server_connection.c
index ce11924752..e37c459510 100644
--- a/src/netcode/server_connection.c
+++ b/src/netcode/server_connection.c
@@ -422,7 +422,7 @@ GetRefuseMessage (SINT8 node, INT32 rejoinernum)
* \param node The packet sender
*
*/
-void HandleConnect(SINT8 node)
+void PT_Connect(SINT8 node)
{
char names[MAXSPLITSCREENPLAYERS][MAXPLAYERNAME + 1];
INT32 numplayers = netbuffer->u.clientcfg.localplayers;
diff --git a/src/netcode/server_connection.h b/src/netcode/server_connection.h
index a40bd4603f..585c9e428e 100644
--- a/src/netcode/server_connection.h
+++ b/src/netcode/server_connection.h
@@ -17,7 +17,7 @@
#include "../doomdef.h"
#include "../doomtype.h"
-void HandleConnect(SINT8 node);
+void PT_Connect(SINT8 node);
void PT_AskInfoViaMS(SINT8 node);
void PT_TellFilesNeeded(SINT8 node);
void PT_AskInfo(SINT8 node);
--
GitLab