diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-15 19:51:09 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-15 19:51:09 +0100 |
commit | 8e5578e66477924ed793869469aa234b0921d87c (patch) | |
tree | 7dd7300955418042e361c2c1039fb79a77480c6b /src/server/game/Events/GameEventMgr.cpp | |
parent | 9b108fad857381f386324c8c8f75cca3480e20be (diff) | |
parent | 80006a275f890be065f69a1696fa265bc5f54af2 (diff) |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/game/Events/GameEventMgr.cpp')
-rwxr-xr-x | src/server/game/Events/GameEventMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 704bdde740e..2116738fac3 100755 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -205,7 +205,7 @@ void GameEventMgr::LoadFromDB() { { uint32 oldMSTime = getMSTime(); - // 1 2 3 4 5 6 7 8 + // 0 1 2 3 4 5 6 7 QueryResult result = WorldDatabase.Query("SELECT eventEntry, UNIX_TIMESTAMP(start_time), UNIX_TIMESTAMP(end_time), occurence, length, holiday, description, world_event FROM game_event"); if (!result) { @@ -366,7 +366,7 @@ void GameEventMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - // 1 2 + // 0 1 QueryResult result = WorldDatabase.Query("SELECT creature.guid, game_event_creature.eventEntry FROM creature" " JOIN game_event_creature ON creature.guid = game_event_creature.guid"); |