Port Opcode system from MangosThree

mangosone · Aug 27, 2024 · 6a7ae14 · 6a7ae14
1 parent 6ead39b
commit 6a7ae14
Show file tree

Hide file tree

Showing 7 changed files with 1,101 additions and 1,067 deletions.
diff --git a/src/game/ChatCommands/DebugCommands.cpp b/src/game/ChatCommands/DebugCommands.cpp
@@ -275,7 +275,7 @@ bool ChatHandler::HandleDebugSendOpcodeCommand(char* /*args*/)
         return false;
     }
 
-    WorldPacket data(Opcodes(opcode), 0);
+    WorldPacket data(OpcodesList(opcode), 0);
 
     std::string type;
     while (stream >> type)
@@ -1392,7 +1392,7 @@ bool ChatHandler::HandleDebugSpellModsCommand(char* args)
         return false;
     }
 
-    Opcodes opcode;
+    OpcodesList opcode;
     if (strncmp(typeStr, "flat", strlen(typeStr)) == 0)
     {
         opcode = SMSG_SET_FLAT_SPELL_MODIFIER;

diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp
@@ -20359,7 +20359,7 @@ bool Player::IsAffectedBySpellmod(SpellEntry const* spellInfo, SpellModifier* mo
 
 void Player::AddSpellMod(SpellModifier* mod, bool apply)
 {
-    Opcodes opcode = (mod->type == SPELLMOD_FLAT) ? SMSG_SET_FLAT_SPELL_MODIFIER : SMSG_SET_PCT_SPELL_MODIFIER;
+    OpcodesList opcode = (mod->type == SPELLMOD_FLAT) ? SMSG_SET_FLAT_SPELL_MODIFIER : SMSG_SET_PCT_SPELL_MODIFIER;
 
     for (int eff = 0; eff < 64; ++eff)
     {

diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp
diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h
@@ -30,6 +30,7 @@
 #define MANGOS_H_OPCODES
 
 #include "Common.h"
+#include "Policies/Singleton.h"
 
 // Note: this include need for be sure have full definition of class WorldSession
 //       if this class definition not complite then VS for x64 release use different size for
@@ -49,7 +50,7 @@
  * \see WorldPacket
  * \todo Replace the Pack GUID part with a packed GUID, ie: it's shorter than usual?
  */
-enum Opcodes
+enum OpcodesList
 {
     MSG_NULL_ACTION                                 = 0x000,
     CMSG_BOOTME                                     = 0x001,
@@ -521,7 +522,7 @@ enum Opcodes
     CMSG_WRAP_ITEM                                  = 0x1D3,
     SMSG_LEVELUP_INFO                               = 0x1D4,
     MSG_MINIMAP_PING                                = 0x1D5,
-    SMSG_RESISTLOG                                  = 0x1D6,
+    SMSG_RESISTLOG                                  = 0x1D6,// GUID, GUID, int32, float, float, int32, int32
     SMSG_ENCHANTMENTLOG                             = 0x1D7,
     CMSG_SET_SKILL_CHEAT                            = 0x1D8,
     SMSG_START_MIRROR_TIMER                         = 0x1D9,
@@ -1116,6 +1117,8 @@ enum Opcodes
 // Don't forget to change this value and add opcode name to Opcodes.cpp when you add new opcode!
 #define NUM_MSG_TYPES 0x424
 
+extern void InitializeOpcodes();
+
 /// Player state
 enum SessionStatus
 {

diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp
@@ -180,6 +180,12 @@ void WorldSession::SendPacket(WorldPacket const* packet)
         return;
     }
 
+    if (opcodeTable[packet->GetOpcode()].status == STATUS_UNHANDLED)
+    {
+        sLog.outError("SESSION: tried to send an unhandled opcode 0x%.4X", packet->GetOpcode());
+        return;
+    }
+
 #ifdef MANGOS_DEBUG
 
     // Code for network use statistic

diff --git a/src/game/Server/WorldSocket.cpp b/src/game/Server/WorldSocket.cpp
@@ -403,7 +403,7 @@ int WorldSocket::handle_input_header(void)
 
     header.size -= 4;
 
-    ACE_NEW_RETURN(m_RecvWPct, WorldPacket(Opcodes(header.cmd), header.size), -1);
+    ACE_NEW_RETURN(m_RecvWPct, WorldPacket(OpcodesList(header.cmd), header.size), -1);
 
     if (header.size > 0)
     {

diff --git a/src/game/Server/WorldSocketMgr.cpp b/src/game/Server/WorldSocketMgr.cpp
@@ -32,6 +32,7 @@
 #include "Config/Config.h"
 #include "WorldSocket.h"
 #include "WorldSocketMgr.h"
+#include "Opcodes.h"
 
 #include <ace/ACE.h>
 #include <ace/TP_Reactor.h>
@@ -46,6 +47,7 @@ WorldSocketMgr::WorldSocketMgr()
   : m_SockOutKBuff(-1), m_SockOutUBuff(65536), m_UseNoDelay(true),
     reactor_(NULL), acceptor_(NULL)
 {
+    InitializeOpcodes();
 }
 
 WorldSocketMgr::~WorldSocketMgr()