Fix outputDebugString level 4 colors (PR multitheftauto#3474)

Fernando-A-Rocha · Jun 17, 2024 · 5d4d7df · 5d4d7df
1 parent f8d9b43
commit 5d4d7df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Client/mods/deathmatch/logic/CPacketHandler.cpp b/Client/mods/deathmatch/logic/CPacketHandler.cpp
@@ -1471,7 +1471,7 @@ void CPacketHandler::Packet_DebugEcho(NetBitStreamInterface& bitStream)
     if (!bitStream.Read(ucLevel))
         return;
 
-    if (ucLevel == 0)
+    if (ucLevel == 0 || ucLevel == 4)
     {
         // Read out the color
         if (!bitStream.Read(ucRed) || !bitStream.Read(ucGreen) || !bitStream.Read(ucBlue))
@@ -1481,7 +1481,7 @@ void CPacketHandler::Packet_DebugEcho(NetBitStreamInterface& bitStream)
     }
 
     // Valid length?
-    int iBytesRead = (ucLevel == 0) ? 4 : 1;
+    int iBytesRead = (ucLevel == 0 || ucLevel == 4) ? 4 : 1;
     int iNumberOfBytesUsed = bitStream.GetNumberOfBytesUsed() - iBytesRead;
     if (iNumberOfBytesUsed >= MIN_DEBUGECHO_LENGTH && iNumberOfBytesUsed <= MAX_DEBUGECHO_LENGTH)
     {

diff --git a/Server/mods/deathmatch/logic/packets/CDebugEchoPacket.cpp b/Server/mods/deathmatch/logic/packets/CDebugEchoPacket.cpp
@@ -16,7 +16,7 @@ bool CDebugEchoPacket::Write(NetBitStreamInterface& BitStream) const
 {
     // Write the level
     BitStream.Write(static_cast<unsigned char>(m_uiLevel));
-    if (m_uiLevel == 0)
+    if (m_uiLevel == 0 || m_uiLevel == 4)
     {
         // Write the color
         BitStream.Write(m_ucRed);