aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-06-07 19:56:40 +0200
committerShauren <shauren.trinity@gmail.com>2016-06-07 19:56:40 +0200
commit6226f04cafbcecb5b936cdb320b5bc05db3e4369 (patch)
treef3982dbc46ed43e1ed3816f0a730c78b4bc4324d /src/server/game/Globals/ObjectMgr.cpp
parent737469cfaaaf45fe700ae8a9673015b88afd0b00 (diff)
Core/PacketIO: Updated query opcodes
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 8f0c1ff8b15..24c2c52387a 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -5125,8 +5125,8 @@ void ObjectMgr::LoadPageTexts()
{
uint32 oldMSTime = getMSTime();
- // 0 1 2
- QueryResult result = WorldDatabase.Query("SELECT ID, Text, NextPageID FROM page_text");
+ // 0 1 2 3 4
+ QueryResult result = WorldDatabase.Query("SELECT ID, Text, NextPageID, PlayerConditionID, Flags FROM page_text");
if (!result)
{
TC_LOG_INFO("server.loading", ">> Loaded 0 page texts. DB table `page_text` is empty!");
@@ -5143,22 +5143,18 @@ void ObjectMgr::LoadPageTexts()
PageText& pageText = _pageTextStore[id];
pageText.Text = fields[1].GetString();
pageText.NextPageID = fields[2].GetUInt32();
+ pageText.PlayerConditionID = fields[3].GetInt32();
+ pageText.Flags = fields[4].GetUInt8();
++count;
}
while (result->NextRow());
for (PageTextContainer::const_iterator itr = _pageTextStore.begin(); itr != _pageTextStore.end(); ++itr)
- {
if (itr->second.NextPageID)
- {
- PageTextContainer::const_iterator itr2 = _pageTextStore.find(itr->second.NextPageID);
- if (itr2 == _pageTextStore.end())
+ if (_pageTextStore.find(itr->second.NextPageID) == _pageTextStore.end())
TC_LOG_ERROR("sql.sql", "Page text (ID: %u) has non-existing `NextPageID` (%u)", itr->first, itr->second.NextPageID);
- }
- }
-
TC_LOG_INFO("server.loading", ">> Loaded %u page texts in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
}