Core/Player: Moved character_template from character to world db

2 files changed, 15 insertions, 12 deletions

diff --git a/src/server/game/Server/Packets/AuthenticationPackets.cpp b/src/server/game/Server/Packets/AuthenticationPackets.cpp
index d8e94418d8e..70dec6bd274 100644
--- a/src/server/game/Server/Packets/AuthenticationPackets.cpp
+++ b/src/server/game/Server/Packets/AuthenticationPackets.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "AuthenticationPackets.h"
+#include "CharacterTemplateDataStore.h"
 #include "HmacHash.h"
 
 bool WorldPackets::Auth::EarlyProcessClientPacket::ReadNoThrow()
@@ -109,13 +110,13 @@ WorldPacket const* WorldPackets::Auth::AuthResponse::Write()
         _worldPacket << uint32(SuccessInfo->CurrencyID);
         _worldPacket << int32(SuccessInfo->Time);
 
-        for (auto& race : *SuccessInfo->AvailableRaces)
+        for (auto const& race : *SuccessInfo->AvailableRaces)
         {
             _worldPacket << uint8(race.first); /// the current race
             _worldPacket << uint8(race.second); /// the required Expansion
         }
 
-        for (auto& klass : *SuccessInfo->AvailableClasses)
+        for (auto const& klass : *SuccessInfo->AvailableClasses)
         {
             _worldPacket << uint8(klass.first); /// the current class
             _worldPacket << uint8(klass.second); /// the required Expansion
@@ -143,7 +144,7 @@ WorldPacket const* WorldPackets::Auth::AuthResponse::Write()
         if (SuccessInfo->NumPlayersAlliance)
             _worldPacket << uint16(*SuccessInfo->NumPlayersAlliance);
 
-        for (auto& virtualRealm : SuccessInfo->VirtualRealms)
+        for (auto const& virtualRealm : SuccessInfo->VirtualRealms)
         {
             _worldPacket << uint32(virtualRealm.RealmAddress);
             _worldPacket.WriteBit(virtualRealm.IsLocal);
@@ -156,22 +157,22 @@ WorldPacket const* WorldPackets::Auth::AuthResponse::Write()
             _worldPacket.WriteString(virtualRealm.RealmNameNormalized);
         }
 
-        for (auto& templat : SuccessInfo->Templates)
+        for (CharacterTemplate const* templat : SuccessInfo->Templates)
         {
-            _worldPacket << uint32(templat.TemplateSetId);
-            _worldPacket << uint32(templat.Classes.size());
-            for (auto& templateClass : templat.Classes)
+            _worldPacket << uint32(templat->TemplateSetId);
+            _worldPacket << uint32(templat->Classes.size());
+            for (CharacterTemplateClass const& templateClass : templat->Classes)
             {
                 _worldPacket << uint8(templateClass.ClassID);
                 _worldPacket << uint8(templateClass.FactionGroup);
             }
 
-            _worldPacket.WriteBits(templat.Name.length(), 7);
-            _worldPacket.WriteBits(templat.Description.length(), 10);
+            _worldPacket.WriteBits(templat->Name.length(), 7);
+            _worldPacket.WriteBits(templat->Description.length(), 10);
             _worldPacket.FlushBits();
 
-            _worldPacket.WriteString(templat.Name);
-            _worldPacket.WriteString(templat.Description);
+            _worldPacket.WriteString(templat->Name);
+            _worldPacket.WriteString(templat->Description);
         }
     }
 
diff --git a/src/server/game/Server/Packets/AuthenticationPackets.h b/src/server/game/Server/Packets/AuthenticationPackets.h
index b5fc2b62044..68f32e6ce5e 100644
--- a/src/server/game/Server/Packets/AuthenticationPackets.h
+++ b/src/server/game/Server/Packets/AuthenticationPackets.h
@@ -25,6 +25,8 @@
 #include "SHA1.h"
 #include <boost/asio/ip/tcp.hpp>
 
+struct CharacterTemplate;
+
 using boost::asio::ip::tcp;
 
 namespace WorldPackets
@@ -142,7 +144,7 @@ namespace WorldPackets
                 BillingInfo Billing;
 
                 std::vector<RealmInfo> VirtualRealms;     ///< list of realms connected to this one (inclusive) @todo implement
-                std::vector<CharacterTemplate> Templates; ///< list of pre-made character templates.
+                std::vector<CharacterTemplate const*> Templates; ///< list of pre-made character templates.
 
                 ExpansionRequirementContainer const* AvailableClasses = nullptr; ///< the minimum AccountExpansion required to select the classes
                 ExpansionRequirementContainer const* AvailableRaces = nullptr; ///< the minimum AccountExpansion required to select the races