aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Kalimdor
diff options
context:
space:
mode:
authorGyx <2359980687@qq.com>2012-03-16 20:31:23 +0800
committerGyx <2359980687@qq.com>2012-03-16 20:31:23 +0800
commitcd38e7df2ba09b20f1ea8d778e9b6fe1e0365740 (patch)
tree49e1989a0aef2a669405f2179d7291d9c1227fbe /src/server/scripts/Kalimdor
parentbef1b0c4028a3986d63c3b2c9ebdf532a3c73b5b (diff)
Core/Script: Code style.
Signed-off-by: Gyx <2359980687@qq.com>
Diffstat (limited to 'src/server/scripts/Kalimdor')
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp4
-rw-r--r--src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp6
-rw-r--r--src/server/scripts/Kalimdor/darkshore.cpp1
-rw-r--r--src/server/scripts/Kalimdor/felwood.cpp9
4 files changed, 10 insertions, 10 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
index 7625d22119f..0e155be515a 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
@@ -111,7 +111,7 @@ public:
instance->SetData(TYPE_MEDIVH, IN_PROGRESS);
DoCast(me, SPELL_CHANNEL, false);
Check_Timer = 5000;
- }
+ }
else if (who->GetTypeId() == TYPEID_UNIT && me->IsWithinDistInMap(who, 15.0f))
{
if (instance->GetData(TYPE_MEDIVH) != IN_PROGRESS)
@@ -170,7 +170,7 @@ public:
{
if (SpellCorrupt_Timer <= diff)
{
- instance->SetData(TYPE_MEDIVH, SPECIAL);
+ instance->SetData(TYPE_MEDIVH, SPECIAL);
if (me->HasAura(SPELL_CORRUPT_AEONUS))
SpellCorrupt_Timer = 1000;
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index da29c911c9f..b6c69584358 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -308,7 +308,8 @@ public:
}
}
- void SpawnPyramidWave(uint32 wave){
+ void SpawnPyramidWave(uint32 wave)
+ {
for (int i = 0; i < pyramidSpawnTotal; i++)
{
if (pyramidSpawns[i][0] == (float)wave)
@@ -321,7 +322,8 @@ public:
}
}
- bool IsWaveAllDead(){
+ bool IsWaveAllDead()
+ {
for (std::list<uint64>::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr)
{
if (Creature* add = instance->GetCreature((*itr)))
diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp
index 0d83ea5ad03..a4c8ce3b004 100644
--- a/src/server/scripts/Kalimdor/darkshore.cpp
+++ b/src/server/scripts/Kalimdor/darkshore.cpp
@@ -234,7 +234,6 @@ public:
void WaypointReached(uint32 i)
{
Player* player = GetPlayerForEscort();
-
if (!player)
return;
diff --git a/src/server/scripts/Kalimdor/felwood.cpp b/src/server/scripts/Kalimdor/felwood.cpp
index d540d522326..e1f59ec26be 100644
--- a/src/server/scripts/Kalimdor/felwood.cpp
+++ b/src/server/scripts/Kalimdor/felwood.cpp
@@ -53,12 +53,12 @@ public:
bool OnGossipHello(Player* player, Creature* creature)
{
- uint32 eCreature = creature->GetEntry();
-
if (creature->isQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
- if (eCreature == 9528)
+ uint32 creatureId = creature->GetEntry();
+
+ if (creatureId == 9528)
{
if (player->GetQuestRewardStatus(4101))
{
@@ -70,7 +70,7 @@ public:
player->SEND_GOSSIP_MENU(2844, creature->GetGUID());
}
- if (eCreature == 9529)
+ if (creatureId == 9529)
{
if (player->GetQuestRewardStatus(4102))
{
@@ -84,7 +84,6 @@ public:
return true;
}
-
};
void AddSC_felwood()