diff options
| author | maximius <none@none> | 2009-10-27 23:35:44 -0700 |
|---|---|---|
| committer | maximius <none@none> | 2009-10-27 23:35:44 -0700 |
| commit | 6f097c724cc5e135db92879a48d385000c755d7a (patch) | |
| tree | a54b84f5d7d56d954999ea78e55c24a55ee5c991 /src/bindings/scripts | |
| parent | b243cf3228ddbbd15fe2bb8f5434bd45ce7c303e (diff) | |
*Fix build
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts')
| -rw-r--r-- | src/bindings/scripts/include/precompiled.h | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/world/npc_innkeeper.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bindings/scripts/include/precompiled.h b/src/bindings/scripts/include/precompiled.h index c533aade45f..3d8e1a12cc8 100644 --- a/src/bindings/scripts/include/precompiled.h +++ b/src/bindings/scripts/include/precompiled.h @@ -8,7 +8,7 @@ #include "../ScriptMgr.h" #include "Cell.h" #include "CellImpl.h" -#include "GameEventMgr.cpp" +#include "GameEventMgr.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "Unit.h" diff --git a/src/bindings/scripts/scripts/world/npc_innkeeper.cpp b/src/bindings/scripts/scripts/world/npc_innkeeper.cpp index 43ba02b79df..500356212ff 100644 --- a/src/bindings/scripts/scripts/world/npc_innkeeper.cpp +++ b/src/bindings/scripts/scripts/world/npc_innkeeper.cpp @@ -40,7 +40,7 @@ EndScriptData */ bool GossipHello_npc_innkeeper(Player *pPlayer, Creature *pCreature) { - if (gameeventmgr.IsActiveEvent(HALLOWEEN_EVENTID) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED)) + if (IsEventActive(HALLOWEEN_EVENTID) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED)) { char* localizedEntry; switch (pPlayer->GetSession()->GetSessionDbcLocale()) @@ -77,7 +77,7 @@ bool GossipHello_npc_innkeeper(Player *pPlayer, Creature *pCreature) bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (uiAction == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && gameeventmgr.IsActiveEvent(HALLOWEEN_EVENTID) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED)) + if (uiAction == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && IsEventActive(HALLOWEEN_EVENTID) && !pPlayer->HasAura(SPELL_TRICK_OR_TREATED)) { pPlayer->CastSpell(pPlayer, SPELL_TRICK_OR_TREATED, true); |