diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-07-31 22:27:57 +0200 | 
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-07-31 22:27:57 +0200 | 
| commit | f26edf09d31ce77d96c75378991c89475e5f6320 (patch) | |
| tree | e4988095380be14b89f34699abf7d827ad20759c /src | |
| parent | 0711746b573c665d6970ce3a0acb52a5f3319296 (diff) | |
Fix gcc build and remove redundant check from 0afc3c
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 4 | ||||
| -rwxr-xr-x | src/server/scripts/World/chat_log.cpp | 2 | 
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 3cba4c678de..7f78055dde5 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -890,7 +890,7 @@ void Unit::CastStop(uint32 except_spellid)              InterruptSpell(CurrentSpellTypes(i), false);  } -inline void Unit::CastSpell(Unit* victim, uint32 spellId, bool triggered, Item* castItem, AuraEffect const* triggeredByAura, uint64 originalCaster) +void Unit::CastSpell(Unit* victim, uint32 spellId, bool triggered, Item* castItem, AuraEffect const* triggeredByAura, uint64 originalCaster)  {      CastSpell(victim, spellId, triggered ? TRIGGERED_FULL_MASK : TRIGGERED_NONE, castItem, triggeredByAura, originalCaster);  } @@ -908,7 +908,7 @@ void Unit::CastSpell(Unit* victim, uint32 spellId, TriggerCastFlags triggerFlags      CastSpell(victim, spellInfo, triggerFlags, castItem, triggeredByAura, originalCaster);  } -inline void Unit::CastSpell(Unit* victim, SpellInfo const *spellInfo, bool triggered, Item *castItem/*= NULL*/, AuraEffect const* triggeredByAura /*= NULL*/, uint64 originalCaster /*= 0*/) +void Unit::CastSpell(Unit* victim, SpellInfo const *spellInfo, bool triggered, Item *castItem/*= NULL*/, AuraEffect const* triggeredByAura /*= NULL*/, uint64 originalCaster /*= 0*/)  {      CastSpell(victim, spellInfo, triggered ? TRIGGERED_FULL_MASK : TRIGGERED_NONE, castItem, triggeredByAura, originalCaster);  } diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp index 2e13411336a..07b6840b6c6 100755 --- a/src/server/scripts/World/chat_log.cpp +++ b/src/server/scripts/World/chat_log.cpp @@ -81,7 +81,7 @@ public:                  break;              case CHAT_MSG_PARTY_LEADER: -                if (lang != LANG_ADDON && sWorld->getBoolConfig(CONFIG_CHATLOG_PARTY)) +                if (sWorld->getBoolConfig(CONFIG_CHATLOG_PARTY))                      sLog->outChat("[PARTY] Leader %s tells group: %s",                          player->GetName(), msg.c_str());                  break;  | 
