From 213b26b3ef9cb50c6428a19500d054f2d8c306e4 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Sun, 17 May 2026 20:07:43 +0200 Subject: [PATCH 1/8] Refactored 'DoesCommandRequireACommandID'. --- .../Source/GameNetwork/NetworkUtil.cpp | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp index 174599cc97c..eb9eb0afd28 100644 --- a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp @@ -119,29 +119,31 @@ UnsignedShort GenerateNextCommandID() { /** * Returns true if this type of command requires a unique command ID. */ -Bool DoesCommandRequireACommandID(NetCommandType type) { - if ((type == NETCOMMANDTYPE_GAMECOMMAND) || - (type == NETCOMMANDTYPE_FRAMEINFO) || - (type == NETCOMMANDTYPE_PLAYERLEAVE) || - (type == NETCOMMANDTYPE_DESTROYPLAYER) || - (type == NETCOMMANDTYPE_RUNAHEADMETRICS) || - (type == NETCOMMANDTYPE_RUNAHEAD) || - (type == NETCOMMANDTYPE_CHAT) || - (type == NETCOMMANDTYPE_DISCONNECTVOTE) || - (type == NETCOMMANDTYPE_LOADCOMPLETE) || - (type == NETCOMMANDTYPE_TIMEOUTSTART) || - (type == NETCOMMANDTYPE_WRAPPER) || - (type == NETCOMMANDTYPE_FILE) || - (type == NETCOMMANDTYPE_FILEANNOUNCE) || - (type == NETCOMMANDTYPE_FILEPROGRESS) || - (type == NETCOMMANDTYPE_DISCONNECTPLAYER) || - (type == NETCOMMANDTYPE_DISCONNECTFRAME) || - (type == NETCOMMANDTYPE_DISCONNECTSCREENOFF) || - (type == NETCOMMANDTYPE_FRAMERESENDREQUEST)) - { +Bool DoesCommandRequireACommandID(NetCommandType type) +{ + switch (type) { + case NETCOMMANDTYPE_FRAMEINFO: + case NETCOMMANDTYPE_GAMECOMMAND: + case NETCOMMANDTYPE_PLAYERLEAVE: + case NETCOMMANDTYPE_RUNAHEADMETRICS: + case NETCOMMANDTYPE_RUNAHEAD: + case NETCOMMANDTYPE_DESTROYPLAYER: + case NETCOMMANDTYPE_CHAT: + case NETCOMMANDTYPE_LOADCOMPLETE: + case NETCOMMANDTYPE_TIMEOUTSTART: + case NETCOMMANDTYPE_WRAPPER: + case NETCOMMANDTYPE_FILE: + case NETCOMMANDTYPE_FILEANNOUNCE: + case NETCOMMANDTYPE_FILEPROGRESS: + case NETCOMMANDTYPE_FRAMERESENDREQUEST: + case NETCOMMANDTYPE_DISCONNECTPLAYER: + case NETCOMMANDTYPE_DISCONNECTVOTE: + case NETCOMMANDTYPE_DISCONNECTFRAME: + case NETCOMMANDTYPE_DISCONNECTSCREENOFF: return TRUE; + default: + return FALSE; } - return FALSE; } /** From fd3a50bb82975b80aa91983927bef6d842a181a0 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Sun, 17 May 2026 20:09:56 +0200 Subject: [PATCH 2/8] Refactored 'CommandRequiresAck'. --- .../Include/GameNetwork/networkutil.h | 2 +- .../Source/GameNetwork/NetworkUtil.cpp | 27 +++---------------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/Core/GameEngine/Include/GameNetwork/networkutil.h b/Core/GameEngine/Include/GameNetwork/networkutil.h index 944e2ce0a60..e018258e56e 100644 --- a/Core/GameEngine/Include/GameNetwork/networkutil.h +++ b/Core/GameEngine/Include/GameNetwork/networkutil.h @@ -31,7 +31,7 @@ UnsignedInt AssembleIp(UnsignedByte a, UnsignedByte b, UnsignedByte c, UnsignedB UnsignedInt ResolveIP(AsciiString host); UnsignedShort GenerateNextCommandID(); Bool DoesCommandRequireACommandID(NetCommandType type); -Bool CommandRequiresAck(NetCommandMsg *msg); +Bool CommandRequiresAck(const NetCommandMsg *msg); Bool CommandRequiresDirectSend(NetCommandMsg *msg); Bool IsCommandSynchronized(NetCommandType type); const char* GetNetCommandTypeAsString(NetCommandType type); diff --git a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp index eb9eb0afd28..396f1b2111b 100644 --- a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp @@ -149,30 +149,9 @@ Bool DoesCommandRequireACommandID(NetCommandType type) /** * Returns true if this type of network command requires an ack. */ -Bool CommandRequiresAck(NetCommandMsg *msg) { - if ((msg->getNetCommandType() == NETCOMMANDTYPE_GAMECOMMAND) || - (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMEINFO) || - (msg->getNetCommandType() == NETCOMMANDTYPE_PLAYERLEAVE) || - (msg->getNetCommandType() == NETCOMMANDTYPE_DESTROYPLAYER) || - (msg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEADMETRICS) || - (msg->getNetCommandType() == NETCOMMANDTYPE_RUNAHEAD) || - (msg->getNetCommandType() == NETCOMMANDTYPE_CHAT) || - (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTVOTE) || - (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) || - (msg->getNetCommandType() == NETCOMMANDTYPE_LOADCOMPLETE) || - (msg->getNetCommandType() == NETCOMMANDTYPE_TIMEOUTSTART) || - (msg->getNetCommandType() == NETCOMMANDTYPE_WRAPPER) || - (msg->getNetCommandType() == NETCOMMANDTYPE_FILE) || - (msg->getNetCommandType() == NETCOMMANDTYPE_FILEANNOUNCE) || - (msg->getNetCommandType() == NETCOMMANDTYPE_FILEPROGRESS) || - (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) || - (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) || - (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTSCREENOFF) || - (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMERESENDREQUEST)) - { - return TRUE; - } - return FALSE; +Bool CommandRequiresAck(const NetCommandMsg* msg) +{ + return DoesCommandRequireACommandID(msg->getNetCommandType()); } Bool IsCommandSynchronized(NetCommandType type) { From cd8c98cc2dcc7c2cf0998bd4ff7d0e82ce639567 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Sun, 17 May 2026 20:10:38 +0200 Subject: [PATCH 3/8] Refactored 'IsCommandSynchronized'. --- .../Source/GameNetwork/NetworkUtil.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp index 396f1b2111b..9fd47437ffa 100644 --- a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp @@ -154,16 +154,18 @@ Bool CommandRequiresAck(const NetCommandMsg* msg) return DoesCommandRequireACommandID(msg->getNetCommandType()); } -Bool IsCommandSynchronized(NetCommandType type) { - if ((type == NETCOMMANDTYPE_GAMECOMMAND) || - (type == NETCOMMANDTYPE_FRAMEINFO) || - (type == NETCOMMANDTYPE_PLAYERLEAVE) || - (type == NETCOMMANDTYPE_DESTROYPLAYER) || - (type == NETCOMMANDTYPE_RUNAHEAD)) - { +Bool IsCommandSynchronized(NetCommandType type) +{ + switch (type) { + case NETCOMMANDTYPE_FRAMEINFO: + case NETCOMMANDTYPE_GAMECOMMAND: + case NETCOMMANDTYPE_PLAYERLEAVE: + case NETCOMMANDTYPE_RUNAHEAD: + case NETCOMMANDTYPE_DESTROYPLAYER: return TRUE; + default: + return FALSE; } - return FALSE; } /** From 21891b8c9ec79bab8f1184d0c8346a32ac16c70d Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Sun, 17 May 2026 20:11:26 +0200 Subject: [PATCH 4/8] Refactored 'CommandRequiresDirectSend'. --- .../Include/GameNetwork/networkutil.h | 2 +- .../Source/GameNetwork/NetworkUtil.cpp | 27 ++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Core/GameEngine/Include/GameNetwork/networkutil.h b/Core/GameEngine/Include/GameNetwork/networkutil.h index e018258e56e..722c59fd7ff 100644 --- a/Core/GameEngine/Include/GameNetwork/networkutil.h +++ b/Core/GameEngine/Include/GameNetwork/networkutil.h @@ -32,7 +32,7 @@ UnsignedInt ResolveIP(AsciiString host); UnsignedShort GenerateNextCommandID(); Bool DoesCommandRequireACommandID(NetCommandType type); Bool CommandRequiresAck(const NetCommandMsg *msg); -Bool CommandRequiresDirectSend(NetCommandMsg *msg); +Bool CommandRequiresDirectSend(const NetCommandMsg *msg); Bool IsCommandSynchronized(NetCommandType type); const char* GetNetCommandTypeAsString(NetCommandType type); diff --git a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp index 9fd47437ffa..4676cb4d3ac 100644 --- a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp @@ -173,20 +173,23 @@ Bool IsCommandSynchronized(NetCommandType type) * rather than going through the packet router. This should really only be used by commands * used on the disconnect screen. */ -Bool CommandRequiresDirectSend(NetCommandMsg *msg) { - if ((msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTVOTE) || - (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTPLAYER) || - (msg->getNetCommandType() == NETCOMMANDTYPE_LOADCOMPLETE) || - (msg->getNetCommandType() == NETCOMMANDTYPE_TIMEOUTSTART) || - (msg->getNetCommandType() == NETCOMMANDTYPE_FILE) || - (msg->getNetCommandType() == NETCOMMANDTYPE_FILEANNOUNCE) || - (msg->getNetCommandType() == NETCOMMANDTYPE_FILEPROGRESS) || - (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTFRAME) || - (msg->getNetCommandType() == NETCOMMANDTYPE_DISCONNECTSCREENOFF) || - (msg->getNetCommandType() == NETCOMMANDTYPE_FRAMERESENDREQUEST)) { +Bool CommandRequiresDirectSend(const NetCommandMsg* msg) +{ + switch (msg->getNetCommandType()) { + case NETCOMMANDTYPE_LOADCOMPLETE: + case NETCOMMANDTYPE_TIMEOUTSTART: + case NETCOMMANDTYPE_FILE: + case NETCOMMANDTYPE_FILEANNOUNCE: + case NETCOMMANDTYPE_FILEPROGRESS: + case NETCOMMANDTYPE_FRAMERESENDREQUEST: + case NETCOMMANDTYPE_DISCONNECTPLAYER: + case NETCOMMANDTYPE_DISCONNECTVOTE: + case NETCOMMANDTYPE_DISCONNECTFRAME: + case NETCOMMANDTYPE_DISCONNECTSCREENOFF: return TRUE; + default: + return FALSE; } - return FALSE; } const char* GetNetCommandTypeAsString(NetCommandType type) { From 9acb5988a369dd9b2d415cc877b6e3a1d5b5eb83 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Sun, 17 May 2026 20:14:06 +0200 Subject: [PATCH 5/8] Refactored 'GetNetCommandTypeAsString'. --- .../Source/GameNetwork/NetworkUtil.cpp | 97 +++++++------------ 1 file changed, 35 insertions(+), 62 deletions(-) diff --git a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp index 4676cb4d3ac..803dbe01461 100644 --- a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp @@ -192,70 +192,43 @@ Bool CommandRequiresDirectSend(const NetCommandMsg* msg) } } -const char* GetNetCommandTypeAsString(NetCommandType type) { +const char* GetNetCommandTypeAsString(NetCommandType type) +{ +#define CASE_LABEL(x) case x: return #x; switch (type) { - case NETCOMMANDTYPE_ACKBOTH: - return "NETCOMMANDTYPE_ACKBOTH"; - case NETCOMMANDTYPE_ACKSTAGE1: - return "NETCOMMANDTYPE_ACKSTAGE1"; - case NETCOMMANDTYPE_ACKSTAGE2: - return "NETCOMMANDTYPE_ACKSTAGE2"; - case NETCOMMANDTYPE_FRAMEINFO: - return "NETCOMMANDTYPE_FRAMEINFO"; - case NETCOMMANDTYPE_GAMECOMMAND: - return "NETCOMMANDTYPE_GAMECOMMAND"; - case NETCOMMANDTYPE_PLAYERLEAVE: - return "NETCOMMANDTYPE_PLAYERLEAVE"; - case NETCOMMANDTYPE_RUNAHEADMETRICS: - return "NETCOMMANDTYPE_RUNAHEADMETRICS"; - case NETCOMMANDTYPE_RUNAHEAD: - return "NETCOMMANDTYPE_RUNAHEAD"; - case NETCOMMANDTYPE_DESTROYPLAYER: - return "NETCOMMANDTYPE_DESTROYPLAYER"; - case NETCOMMANDTYPE_KEEPALIVE: - return "NETCOMMANDTYPE_KEEPALIVE"; - case NETCOMMANDTYPE_DISCONNECTCHAT: - return "NETCOMMANDTYPE_DISCONNECTCHAT"; - case NETCOMMANDTYPE_CHAT: - return "NETCOMMANDTYPE_CHAT"; - case NETCOMMANDTYPE_MANGLERQUERY: - return "NETCOMMANDTYPE_MANGLERQUERY"; - case NETCOMMANDTYPE_MANGLERRESPONSE: - return "NETCOMMANDTYPE_MANGLERRESPONSE"; - case NETCOMMANDTYPE_PROGRESS: - return "NETCOMMANDTYPE_PROGRESS"; - case NETCOMMANDTYPE_LOADCOMPLETE: - return "NETCOMMANDTYPE_LOADCOMPLETE"; - case NETCOMMANDTYPE_TIMEOUTSTART: - return "NETCOMMANDTYPE_TIMEOUTSTART"; - case NETCOMMANDTYPE_WRAPPER: - return "NETCOMMANDTYPE_WRAPPER"; - case NETCOMMANDTYPE_FILE: - return "NETCOMMANDTYPE_FILE"; - case NETCOMMANDTYPE_FILEANNOUNCE: - return "NETCOMMANDTYPE_FILEANNOUNCE"; - case NETCOMMANDTYPE_FILEPROGRESS: - return "NETCOMMANDTYPE_FILEPROGRESS"; - case NETCOMMANDTYPE_DISCONNECTKEEPALIVE: - return "NETCOMMANDTYPE_DISCONNECTKEEPALIVE"; - case NETCOMMANDTYPE_DISCONNECTPLAYER: - return "NETCOMMANDTYPE_DISCONNECTPLAYER"; - case NETCOMMANDTYPE_PACKETROUTERQUERY: - return "NETCOMMANDTYPE_PACKETROUTERQUERY"; - case NETCOMMANDTYPE_PACKETROUTERACK: - return "NETCOMMANDTYPE_PACKETROUTERACK"; - case NETCOMMANDTYPE_DISCONNECTVOTE: - return "NETCOMMANDTYPE_DISCONNECTVOTE"; - case NETCOMMANDTYPE_DISCONNECTFRAME: - return "NETCOMMANDTYPE_DISCONNECTFRAME"; - case NETCOMMANDTYPE_DISCONNECTSCREENOFF: - return "NETCOMMANDTYPE_DISCONNECTSCREENOFF"; - case NETCOMMANDTYPE_FRAMERESENDREQUEST: - return "NETCOMMANDTYPE_FRAMERESENDREQUEST"; - default: - DEBUG_CRASH(("Unknown NetCommandType in GetNetCommandTypeAsString")); - return "UNKNOWN"; + default: return "NETCOMMANDTYPE_UNKNOWN"; + + CASE_LABEL(NETCOMMANDTYPE_ACKBOTH) + CASE_LABEL(NETCOMMANDTYPE_ACKSTAGE1) + CASE_LABEL(NETCOMMANDTYPE_ACKSTAGE2) + CASE_LABEL(NETCOMMANDTYPE_FRAMEINFO) + CASE_LABEL(NETCOMMANDTYPE_GAMECOMMAND) + CASE_LABEL(NETCOMMANDTYPE_PLAYERLEAVE) + CASE_LABEL(NETCOMMANDTYPE_RUNAHEADMETRICS) + CASE_LABEL(NETCOMMANDTYPE_RUNAHEAD) + CASE_LABEL(NETCOMMANDTYPE_DESTROYPLAYER) + CASE_LABEL(NETCOMMANDTYPE_KEEPALIVE) + CASE_LABEL(NETCOMMANDTYPE_DISCONNECTCHAT) + CASE_LABEL(NETCOMMANDTYPE_CHAT) + CASE_LABEL(NETCOMMANDTYPE_MANGLERQUERY) + CASE_LABEL(NETCOMMANDTYPE_MANGLERRESPONSE) + CASE_LABEL(NETCOMMANDTYPE_PROGRESS) + CASE_LABEL(NETCOMMANDTYPE_LOADCOMPLETE) + CASE_LABEL(NETCOMMANDTYPE_TIMEOUTSTART) + CASE_LABEL(NETCOMMANDTYPE_WRAPPER) + CASE_LABEL(NETCOMMANDTYPE_FILE) + CASE_LABEL(NETCOMMANDTYPE_FILEANNOUNCE) + CASE_LABEL(NETCOMMANDTYPE_FILEPROGRESS) + CASE_LABEL(NETCOMMANDTYPE_FRAMERESENDREQUEST) + CASE_LABEL(NETCOMMANDTYPE_DISCONNECTKEEPALIVE) + CASE_LABEL(NETCOMMANDTYPE_DISCONNECTPLAYER) + CASE_LABEL(NETCOMMANDTYPE_PACKETROUTERQUERY) + CASE_LABEL(NETCOMMANDTYPE_PACKETROUTERACK) + CASE_LABEL(NETCOMMANDTYPE_DISCONNECTVOTE) + CASE_LABEL(NETCOMMANDTYPE_DISCONNECTFRAME) + CASE_LABEL(NETCOMMANDTYPE_DISCONNECTSCREENOFF) } +#undef CASE_LABEL } From f1f17d76b27f54794abb239bb3f514785d3bf030 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 18 May 2026 19:06:31 +0200 Subject: [PATCH 6/8] Added two cases to 'GetNetCommandTypeAsString'. --- Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp index 803dbe01461..8e0c674a880 100644 --- a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp @@ -221,6 +221,7 @@ const char* GetNetCommandTypeAsString(NetCommandType type) CASE_LABEL(NETCOMMANDTYPE_FILEANNOUNCE) CASE_LABEL(NETCOMMANDTYPE_FILEPROGRESS) CASE_LABEL(NETCOMMANDTYPE_FRAMERESENDREQUEST) + CASE_LABEL(NETCOMMANDTYPE_DISCONNECTSTART) CASE_LABEL(NETCOMMANDTYPE_DISCONNECTKEEPALIVE) CASE_LABEL(NETCOMMANDTYPE_DISCONNECTPLAYER) CASE_LABEL(NETCOMMANDTYPE_PACKETROUTERQUERY) @@ -228,6 +229,7 @@ const char* GetNetCommandTypeAsString(NetCommandType type) CASE_LABEL(NETCOMMANDTYPE_DISCONNECTVOTE) CASE_LABEL(NETCOMMANDTYPE_DISCONNECTFRAME) CASE_LABEL(NETCOMMANDTYPE_DISCONNECTSCREENOFF) + CASE_LABEL(NETCOMMANDTYPE_DISCONNECTEND) } #undef CASE_LABEL From c5c4147d8be6f5f007c165509a9ebade05f22b79 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 18 May 2026 20:57:43 +0200 Subject: [PATCH 7/8] Changed default / unknown case for 'GetNetCommandTypeAsString'. --- Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp index 8e0c674a880..3465f8b2a90 100644 --- a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp @@ -197,7 +197,10 @@ const char* GetNetCommandTypeAsString(NetCommandType type) #define CASE_LABEL(x) case x: return #x; switch (type) { - default: return "NETCOMMANDTYPE_UNKNOWN"; + CASE_LABEL(NETCOMMANDTYPE_UNKNOWN) + default: + DEBUG_CRASH(("Unhandled NetCommandType in GetNetCommandTypeAsString")); + return ""; CASE_LABEL(NETCOMMANDTYPE_ACKBOTH) CASE_LABEL(NETCOMMANDTYPE_ACKSTAGE1) From 58df0fe9861ea3a0dbb48a058485b291243827a3 Mon Sep 17 00:00:00 2001 From: Caball009 <82909616+Caball009@users.noreply.github.com> Date: Mon, 18 May 2026 22:30:33 +0200 Subject: [PATCH 8/8] Moved default case for 'GetNetCommandTypeAsString'. --- Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp index 3465f8b2a90..77394c1e05f 100644 --- a/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp +++ b/Core/GameEngine/Source/GameNetwork/NetworkUtil.cpp @@ -198,10 +198,6 @@ const char* GetNetCommandTypeAsString(NetCommandType type) switch (type) { CASE_LABEL(NETCOMMANDTYPE_UNKNOWN) - default: - DEBUG_CRASH(("Unhandled NetCommandType in GetNetCommandTypeAsString")); - return ""; - CASE_LABEL(NETCOMMANDTYPE_ACKBOTH) CASE_LABEL(NETCOMMANDTYPE_ACKSTAGE1) CASE_LABEL(NETCOMMANDTYPE_ACKSTAGE2) @@ -233,6 +229,9 @@ const char* GetNetCommandTypeAsString(NetCommandType type) CASE_LABEL(NETCOMMANDTYPE_DISCONNECTFRAME) CASE_LABEL(NETCOMMANDTYPE_DISCONNECTSCREENOFF) CASE_LABEL(NETCOMMANDTYPE_DISCONNECTEND) + default: + DEBUG_CRASH(("Unhandled NetCommandType in GetNetCommandTypeAsString")); + return ""; } #undef CASE_LABEL