diff options
| author | Spp <none@none> | 2010-04-29 23:12:16 +0200 |
|---|---|---|
| committer | Spp <none@none> | 2010-04-29 23:12:16 +0200 |
| commit | cb0cb962831a2b0c62b0a67b750569ca3049327e (patch) | |
| tree | f5638fb8695101002f77106da4264bbeaab46938 /src/scripts | |
| parent | 35af94d4b57d234bc4d6e3c8ab67acb201500bae (diff) | |
Warning Fixes
Code Style cleanup
Fix linux compile
--HG--
branch : trunk
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp | 2 | ||||
| -rw-r--r-- | src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp | 2 | ||||
| -rw-r--r-- | src/scripts/northrend/ulduar/ulduar/boss_freya.cpp | 2 | ||||
| -rw-r--r-- | src/scripts/world/areatrigger_scripts.cpp | 2 | ||||
| -rw-r--r-- | src/scripts/world/npcs_special.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp b/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp index db151f88b8a..f14b73c0319 100644 --- a/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp +++ b/src/scripts/kalimdor/onyxias_lair/boss_onyxia.cpp @@ -99,7 +99,7 @@ static float afSpawnLocations[2][3]= struct boss_onyxiaAI : public ScriptedAI { - boss_onyxiaAI(Creature* pCreature) : ScriptedAI(pCreature) + boss_onyxiaAI(Creature* pCreature) : ScriptedAI(pCreature) { instance = me->GetInstanceData(); } diff --git a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp index 04c87193561..1e60dfc6135 100644 --- a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp @@ -231,7 +231,7 @@ struct boss_tharon_jaAI : public ScriptedAI { // clean morph on players Map::PlayerList const &PlayerList = pInstance->instance->GetPlayers(); - + for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) if (Player *pPlayer = i->getSource()) pPlayer->DeMorph(); diff --git a/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp b/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp index 4a331289044..ee995878a0e 100644 --- a/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp +++ b/src/scripts/northrend/ulduar/ulduar/boss_freya.cpp @@ -53,7 +53,7 @@ enum Yells enum { - // Con-speed-atory timed achievement. + // Con-speed-atory timed achievement. // TODO Should be started when 1st trash is killed. ACHIEV_CON_SPEED_ATORY_START_EVENT = 21597, SPELL_ACHIEVEMENT_CHECK = 65074, diff --git a/src/scripts/world/areatrigger_scripts.cpp b/src/scripts/world/areatrigger_scripts.cpp index a6d5de41c2e..6caddcce5b4 100644 --- a/src/scripts/world/areatrigger_scripts.cpp +++ b/src/scripts/world/areatrigger_scripts.cpp @@ -198,7 +198,7 @@ bool AreaTrigger_at_last_rites(Player* pPlayer, const AreaTriggerEntry* pAt) WorldLocation pPosition; switch(pAt->id) - { + { case 5332: case 5338: pPosition = WorldLocation(571,3733.68,3563.25,290.812,3.665192); diff --git a/src/scripts/world/npcs_special.cpp b/src/scripts/world/npcs_special.cpp index 27e449a660d..8ede2920c9e 100644 --- a/src/scripts/world/npcs_special.cpp +++ b/src/scripts/world/npcs_special.cpp @@ -2185,7 +2185,7 @@ bool GossipHello_npc_locksmith(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_locksmith(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) +bool GossipSelect_npc_locksmith(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction) { switch(uiAction) { |
