aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRat <gmstreetrat@gmail.com>2014-11-10 16:22:10 +0100
committerRat <gmstreetrat@gmail.com>2014-11-10 16:22:10 +0100
commit38de79a07bb86757d4532a258f53b7fdc012af1b (patch)
tree93c4202148c2e0b10dcb4e16618d9ba3eafa0fed
parentef9bc5b17b3ad4f3bdfbd67c937b90d8d1dcd3eb (diff)
fixed build
-rw-r--r--src/server/game/DataStores/DBCStores.cpp2
-rw-r--r--src/server/game/Events/GameEventMgr.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index 2e54b797934..d23d60f452c 100644
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -489,7 +489,7 @@ void LoadDBCStores(const std::string& dataPath)
LoadDBC(availableDbcLocales, bad_dbc_files, sNameGenStore, dbcPath, "NameGen.dbc"); // 19116
for (uint32 i = 0; i < sNameGenStore.GetNumRows(); ++i)
if (NameGenEntry const* entry = sNameGenStore.LookupEntry(i))
- sGenNameVectoArraysMap[entry->Race].stringVectorArray[entry->Sex].push_back(std::string(entry->Name));
+ sGenerateNamesMap[entry->Race].Contents[entry->Sex].push_back(std::string(entry->Name));
sNameGenStore.Clear();
LoadDBC(availableDbcLocales, bad_dbc_files, sMovieStore, dbcPath, "Movie.dbc");//15595
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp
index cf46272080e..4e4afa0c7bf 100644
--- a/src/server/game/Events/GameEventMgr.cpp
+++ b/src/server/game/Events/GameEventMgr.cpp
@@ -1484,10 +1484,10 @@ void GameEventMgr::UpdateWorldStates(uint16 event_id, bool Activate)
if (bgTypeId != BATTLEGROUND_TYPE_NONE)
{
BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(bgTypeId);
- if (bl && bl->HolidayWorldStateId)
+ if (bl && bl->HolidayWorldState)
{
WorldPackets::WorldState::UpdateWorldState worldstate;
- worldstate.VariableID = bl->HolidayWorldStateId;
+ worldstate.VariableID = bl->HolidayWorldState;
worldstate.Value = Activate;
//worldstate.Hidden = false;
sWorld->SendGlobalMessage(worldstate.Write());