diff options
| author | megamage <none@none> | 2009-02-04 17:22:43 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-04 17:22:43 -0600 |
| commit | d69198732e65002b53bab3a85779107490fe4dd2 (patch) | |
| tree | e1f4b11f1964cc42ac05c79bdc43eedc1db16866 /src/game/GameEvent.cpp | |
| parent | 5d4d9530556eb66940775f12c3cc5f3c115447ca (diff) | |
| parent | c745eba4a1d122b4184b27a982674c86ff193c23 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/GameEvent.cpp')
| -rw-r--r-- | src/game/GameEvent.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/GameEvent.cpp b/src/game/GameEvent.cpp index eea76896053..62f285e25ac 100644 --- a/src/game/GameEvent.cpp +++ b/src/game/GameEvent.cpp @@ -238,7 +238,7 @@ void GameEvent::LoadFromDB() } // load game event saves - // 0 1 2 + // 0 1 2 result = CharacterDatabase.Query("SELECT event_id, state, UNIX_TIMESTAMP(next_start) FROM game_event_save"); count = 0; @@ -624,7 +624,7 @@ void GameEvent::LoadFromDB() } // load conditions of the events - // 0 1 2 3 4 + // 0 1 2 3 4 result = WorldDatabase.Query("SELECT event_id, condition_id, req_num, max_world_state_field, done_world_state_field FROM game_event_condition"); count = 0; @@ -669,7 +669,7 @@ void GameEvent::LoadFromDB() } // load condition saves - // 0 1 2 + // 0 1 2 result = CharacterDatabase.Query("SELECT event_id, condition_id, done FROM game_event_condition_save"); count = 0; @@ -1388,7 +1388,7 @@ void GameEvent::UpdateEventQuests(uint16 event_id, bool Activate) if (Activate) // Add the pair(id,quest) to the multimap CreatureQuestMap.insert(QuestRelations::value_type(itr->first, itr->second)); else - { + { if(!hasCreatureQuestActiveEventExcept(itr->second,event_id)) { // Remove the pair(id,quest) from the multimap @@ -1413,7 +1413,7 @@ void GameEvent::UpdateEventQuests(uint16 event_id, bool Activate) if (Activate) // Add the pair(id,quest) to the multimap GameObjectQuestMap.insert(QuestRelations::value_type(itr->first, itr->second)); else - { + { if(!hasGameObjectQuestActiveEventExcept(itr->second,event_id)) { // Remove the pair(id,quest) from the multimap |