diff options
| author | Spp <spp@jorge.gr> | 2012-10-30 10:30:05 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-10-30 10:30:05 +0100 |
| commit | c97fc99e1683edc4a5b177119ba7a775cf7a19a1 (patch) | |
| tree | 16007f950c058d3c6963e2924981d7bbe5a3c898 /src/server/game/Spells/SpellScript.h | |
| parent | 59a828b49ed1e07bd5d705e3d3aa1a6d110be8fc (diff) | |
| parent | cd8e9dfb5213f6e299065cc1f87535a26c2f2936 (diff) | |
Merge branch 'master' into 4.3.4
Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_titles.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
Diffstat (limited to 'src/server/game/Spells/SpellScript.h')
| -rwxr-xr-x | src/server/game/Spells/SpellScript.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index b1a2097a8f9..26dda4d2327 100755 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -72,6 +72,8 @@ class _SpellScript { public: EffectHook(uint8 _effIndex); + virtual ~EffectHook() { } + uint8 GetAffectedEffectsMask(SpellInfo const* spellEntry); bool IsEffectAffected(SpellInfo const* spellEntry, uint8 effIndex); virtual bool CheckEffect(SpellInfo const* spellEntry, uint8 effIndex) = 0; @@ -83,7 +85,7 @@ class _SpellScript class EffectNameCheck { public: - EffectNameCheck(uint16 _effName) {effName = _effName;}; + EffectNameCheck(uint16 _effName) { effName = _effName; } bool Check(SpellInfo const* spellEntry, uint8 effIndex); std::string ToString(); private: @@ -118,7 +120,7 @@ class _SpellScript virtual bool Load() { return true; } // Function called when script is destroyed // use for: deallocating memory allocated by script - virtual void Unload() {} + virtual void Unload() { } }; // SpellScript interface - enum used for runtime checks of script function calls |