aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorAz@zel <azazel.kon@gmail.com>2011-05-11 12:32:54 +0600
committerAz@zel <azazel.kon@gmail.com>2011-05-11 12:32:54 +0600
commit52bc1e5fd3a166ebc2d03b42287fbd07de8e782a (patch)
tree646626c206ca766283f3af340489a9bffb755694 /src/server/game
parent58f0a4b15207d4c80439fe193b41f40c71719c22 (diff)
Core/Misc: more warning fixes (some of them were real logical flaws - comparison of unrelated types) (Thanks to Tassader for pointing out that one line was completely unnecessary)
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Chat/ChatLink.h2
-rwxr-xr-xsrc/server/game/Spells/SpellScript.cpp2
-rwxr-xr-xsrc/server/game/Tickets/TicketMgr.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Chat/ChatLink.h b/src/server/game/Chat/ChatLink.h
index 2d9e95d8d33..6044672e225 100644
--- a/src/server/game/Chat/ChatLink.h
+++ b/src/server/game/Chat/ChatLink.h
@@ -145,7 +145,7 @@ public:
class GlyphChatLink : public SpellChatLink
{
public:
- GlyphChatLink() : SpellChatLink(), _glyph(NULL), _slotId(0) { }
+ GlyphChatLink() : SpellChatLink(), _slotId(0), _glyph(NULL) { }
virtual bool Initialize(std::istringstream& iss);
private:
uint32 _slotId;
diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp
index 2e9cf6ab6f4..bcc1266c9fa 100755
--- a/src/server/game/Spells/SpellScript.cpp
+++ b/src/server/game/Spells/SpellScript.cpp
@@ -204,7 +204,7 @@ bool SpellScript::UnitTargetHandler::CheckEffect(SpellEntry const* spellEntry, u
{
if (!targetType)
return false;
- return (effIndex == SPELL_EFFECT_ANY) || (spellEntry->EffectImplicitTargetA[effIndex] == targetType || spellEntry->EffectImplicitTargetB[effIndex] == targetType);
+ return (effIndex == EFFECT_ALL) || (spellEntry->EffectImplicitTargetA[effIndex] == targetType || spellEntry->EffectImplicitTargetB[effIndex] == targetType);
}
void SpellScript::UnitTargetHandler::Call(SpellScript* spellScript, std::list<Unit*>& unitTargets)
diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp
index cc124c28a88..cbfea3b81bd 100755
--- a/src/server/game/Tickets/TicketMgr.cpp
+++ b/src/server/game/Tickets/TicketMgr.cpp
@@ -196,7 +196,7 @@ void GmTicket::TeleportTo(Player* player) const
///////////////////////////////////////////////////////////////////////////////////////////////////
// Ticket manager
-TicketMgr::TicketMgr() : _lastTicketId(0), _lastSurveyId(0), _openTicketCount(0), _lastChange(time(NULL)), _status(true) { }
+TicketMgr::TicketMgr() : _status(true), _lastTicketId(0), _lastSurveyId(0), _openTicketCount(0), _lastChange(time(NULL)) { }
void TicketMgr::Initialize() { SetStatus(sWorld->getBoolConfig(CONFIG_ALLOW_TICKETS)); }