diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Chat.cpp | 2 | ||||
| -rw-r--r-- | src/game/Player.cpp | 4 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 1b39c49fb90..068d524b9ad 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -1577,7 +1577,7 @@ valid examples: bool foundName = false; for(uint8 i=0; i<MAX_LOCALE; ++i) { - if (*linkedAchievement->name[i], strcmp(linkedAchievement->name[i], buffer) == 0) + if (*linkedAchievement->name[i] && strcmp(linkedAchievement->name[i], buffer) == 0) { foundName = true; break; diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 20cc3265e09..07fdef278d9 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -19867,9 +19867,9 @@ void Player::UpdateForQuestWorldObjects() continue; SpellClickInfoMapBounds clickPair = objmgr.GetSpellClickInfoMapBounds(obj->GetEntry()); - for(SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr) + for(SpellClickInfoMap::const_iterator _itr = clickPair.first; _itr != clickPair.second; ++_itr) { - if(itr->second.questStart || itr->second.questEnd) + if(_itr->second.questStart || _itr->second.questEnd) { obj->BuildCreateUpdateBlockForPlayer(&udata,this); break; diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index a0ca82d7674..ff2af87ad44 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -4804,7 +4804,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) return; } case 55693: // Remove Collapsing Cave Aura - if(unitTarget) + if(!unitTarget) return; unitTarget->RemoveAurasDueToSpell(m_spellInfo->CalculateSimpleValue(effIndex)); break; |