aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Northrend
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-07-21 00:33:36 +0200
committerDDuarte <dnpd.dd@gmail.com>2015-07-24 11:51:48 +0100
commitb4adf3f5dd34d8171f10a6a4ee8689286ef4d66a (patch)
tree3eb9fa5816f034fb4782c516e3c52787a39bde5b /src/server/scripts/Northrend
parentb703d53073e72d5e50aa1d450340464804a8a611 (diff)
Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
(cherry picked from commit a22e4e121a1e54b2f4154d59623ee4a94a449176) Conflicts: cmake/compiler/msvc/settings.cmake src/server/game/DataStores/DBCStores.cpp src/server/game/Entities/GameObject/GameObject.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Object.h src/server/game/Entities/Pet/Pet.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Garrison/Garrison.cpp src/server/game/Garrison/GarrisonMgr.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Globals/ObjectMgr.h src/server/game/Guilds/GuildMgr.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/QueryHandler.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Handlers/SpellHandler.cpp src/server/game/Server/Packets/ChannelPackets.h src/server/game/Server/Packets/PartyPackets.cpp src/server/game/Server/WorldSession.h src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellInfo.cpp src/server/game/Spells/SpellScript.cpp src/server/scripts/Commands/cs_list.cpp
Diffstat (limited to 'src/server/scripts/Northrend')
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp6
-rw-r--r--src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp2
-rw-r--r--src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp13
3 files changed, 11 insertions, 10 deletions
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
index 705d15081c1..3ef6a7c15e3 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
@@ -221,12 +221,12 @@ public:
}
}
- void MovementInform(uint32 type, uint32 id) override
+ void MovementInform(uint32 type, uint32 point) override
{
if (type != POINT_MOTION_TYPE)
return;
- if (id == 2 || id == 5 || id == 8 || id == 11)
+ if (point == 2 || point == 5 || point == 8 || point == 11)
{
movementCompleted = true;
me->SetReactState(REACT_AGGRESSIVE);
@@ -251,7 +251,7 @@ public:
}
nextMovementStarted = false;
- nextWP = id + 1;
+ nextWP = point + 1;
}
// switch to "who" if nearer than current target.
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
index 7a76e8b8217..dd67f2b1ac0 100644
--- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
@@ -176,8 +176,6 @@ class boss_gothik : public CreatureScript
}
uint32 waveCount;
- typedef std::vector<Creature*> TriggerVct;
- TriggerVct liveTrigger, deadTrigger;
bool mergedSides;
bool phaseTwo;
bool thirtyPercentReached;
diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
index e38544315ee..fef04ac5c07 100644
--- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
@@ -220,11 +220,14 @@ public:
DoCast(SPELL_SUMMON_ETHEREAL_SPHERE_2);
break;
case EVENT_SUMMON_PLAYERS:
- if (Creature* sphere = me->FindNearestCreature(NPC_ETHEREAL_SPHERE, 150.0f))
- sphere->GetAI()->DoAction(ACTION_SUMMON);
- else if (Creature* sphere = me->FindNearestCreature(NPC_ETHEREAL_SPHERE2, 150.0f))
- sphere->GetAI()->DoAction(ACTION_SUMMON);
- break;
+ {
+ Creature* sphere = me->FindNearestCreature(NPC_ETHEREAL_SPHERE, 150.0f);
+ if (!sphere)
+ sphere = me->FindNearestCreature(NPC_ETHEREAL_SPHERE2, 150.0f);
+ if (sphere)
+ sphere->GetAI()->DoAction(ACTION_SUMMON);
+ break;
+ }
default:
break;
}