From 6f097c724cc5e135db92879a48d385000c755d7a Mon Sep 17 00:00:00 2001 From: maximius Date: Tue, 27 Oct 2009 23:35:44 -0700 Subject: *Fix build --HG-- branch : trunk --- src/bindings/scripts/include/precompiled.h | 2 +- src/bindings/scripts/scripts/world/npc_innkeeper.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/bindings/scripts') 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); -- cgit v1.2.3