Core/Battle.net:

* Changed packet structures to mirror client names
* Simplified ToString Building
* Removed deprecated structures

World: Cleaned up duplicate realm info 'realm' and 'realmHandle' variables (realmHandle was removed, that data is fully contained in realm)

1 files changed, 10 insertions, 14 deletions

diff --git a/src/server/bnetserver/Server/ModuleManager.h b/src/server/bnetserver/Server/ModuleManager.h
index 68d5b2a1e78..ecd24a07363 100644
--- a/src/server/bnetserver/Server/ModuleManager.h
+++ b/src/server/bnetserver/Server/ModuleManager.h
@@ -18,10 +18,7 @@
 #ifndef ModuleManager_h__
 #define ModuleManager_h__
 
-#include "Define.h"
-#include <cstring>
-#include <string>
-#include <map>
+#include "PacketsCommon.h"
 
 namespace Battlenet
 {
@@ -42,12 +39,14 @@ namespace Battlenet
         }
     };
 
-    struct ModuleInfo
+    struct ModuleInfo : public PrintableComponent
     {
-        ModuleInfo() : Region("EU"), DataSize(0), Data(nullptr) { }
-        ModuleInfo(ModuleInfo const& right) : Type(right.Type), Region(right.Region), DataSize(right.DataSize), Data(nullptr)
+        ModuleInfo() : DataSize(0), Data(nullptr) { Handle.Region = "EU"; }
+        ModuleInfo(ModuleInfo const& right) : DataSize(right.DataSize), Data(nullptr)
         {
-            memcpy(ModuleId, right.ModuleId, 32);
+            Handle.Type = right.Handle.Type;
+            Handle.Region = right.Handle.Region;
+            memcpy(Handle.ModuleId, right.Handle.ModuleId, 32);
             if (DataSize)
             {
                 Data = new uint8[DataSize];
@@ -60,11 +59,11 @@ namespace Battlenet
             delete[] Data;
         }
 
-        std::string Type;
-        std::string Region;
-        uint8 ModuleId[32];
+        Cache::Handle Handle;
         uint32 DataSize;
         uint8* Data;
+
+        std::string ToString() const override;
     };
 
     class ModuleManager
@@ -83,9 +82,6 @@ namespace Battlenet
         }
 
     private:
-        void LoadComponents();
-        void LoadModules();
-
         std::map<ModuleKey, ModuleInfo*> _modules;
     };
 }