diff options
| -rwxr-xr-x | src/server/game/Scripting/MapScripts.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index de5d24ee6b6..36d8304ed52 100755 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -539,8 +539,8 @@ void Map::ScriptsProcess() // when script called for item spell casting then target == (unit or GO) and source is player WorldObject* worldObject; - Player* target = target->ToPlayer(); - if (target) + Player* pTarget = target->ToPlayer(); + if (pTarget) { if (source->GetTypeId() != TYPEID_UNIT && source->GetTypeId() != TYPEID_GAMEOBJECT && source->GetTypeId() != TYPEID_PLAYER) { @@ -552,7 +552,7 @@ void Map::ScriptsProcess() } else { - target = source->ToPlayer(); + pTarget = source->ToPlayer(); if (target) { if (target->GetTypeId() != TYPEID_UNIT && target->GetTypeId() != TYPEID_GAMEOBJECT && target->GetTypeId() != TYPEID_PLAYER) @@ -576,9 +576,9 @@ void Map::ScriptsProcess() // quest id and flags checked at script loading if ((worldObject->GetTypeId() != TYPEID_UNIT || ((Unit*)worldObject)->isAlive()) && (step.script->QuestExplored.Distance == 0 || worldObject->IsWithinDistInMap(target, float(step.script->QuestExplored.Distance)))) - target->AreaExploredOrEventHappens(step.script->QuestExplored.QuestID); + pTarget->AreaExploredOrEventHappens(step.script->QuestExplored.QuestID); else - target->FailQuest(step.script->QuestExplored.QuestID); + pTarget->FailQuest(step.script->QuestExplored.QuestID); break; } @@ -686,8 +686,8 @@ void Map::ScriptsProcess() { // Source (datalong2 != 0) or target (datalong2 == 0) must be Unit. bool bReverse = step.script->RemoveAura.Flags & SF_REMOVEAURA_REVERSE; - if (Unit* target = _GetScriptUnit(bReverse ? source : target, bReverse, step.script)) - target->RemoveAurasDueToSpell(step.script->RemoveAura.SpellID); + if (Unit* pTarget = _GetScriptUnit(bReverse ? source : target, bReverse, step.script)) + pTarget->RemoveAurasDueToSpell(step.script->RemoveAura.SpellID); break; } @@ -751,20 +751,20 @@ void Map::ScriptsProcess() if (WorldObject* pSource = _GetScriptWorldObject(source, true, step.script)) { // PlaySound.Flags bitmask: 0/1=anyone/target - Player* target = NULL; + Player* pTarget = NULL; if (step.script->PlaySound.Flags & SF_PLAYSOUND_TARGET_PLAYER) { // Target must be Player. - target = _GetScriptPlayer(target, false, step.script); - if (!target) + pTarget = _GetScriptPlayer(target, false, step.script); + if (!pTarget) break; } // PlaySound.Flags bitmask: 0/2=without/with distance dependent if (step.script->PlaySound.Flags & SF_PLAYSOUND_DISTANCE_SOUND) - pSource->PlayDistanceSound(step.script->PlaySound.SoundID, target); + pSource->PlayDistanceSound(step.script->PlaySound.SoundID, pTarget); else - pSource->PlayDirectSound(step.script->PlaySound.SoundID, target); + pSource->PlayDirectSound(step.script->PlaySound.SoundID, pTarget); } break; @@ -878,11 +878,11 @@ void Map::ScriptsProcess() if (step.script->Orientation.Flags& SF_ORIENTATION_FACE_TARGET) { // Target must be Unit. - Unit* target = _GetScriptUnit(target, false, step.script); - if (!target) + Unit* pTarget = _GetScriptUnit(target, false, step.script); + if (!pTarget) break; - pSource->SetInFront(target); + pSource->SetInFront(pTarget); } else pSource->SetOrientation(step.script->Orientation.Orientation); |