diff options
author | Paradox <none@none> | 2009-02-18 07:46:24 -0500 |
---|---|---|
committer | Paradox <none@none> | 2009-02-18 07:46:24 -0500 |
commit | 3ea5417336b8bd271bb33e616c2dbdc6a2331734 (patch) | |
tree | 591452af025c4a01c878df06634482365e117b40 | |
parent | 89ba43ef3e3f8d4b563c9e8efaf06bf7f7b44065 (diff) |
Yet more tabs to spaces
--HG--
branch : trunk
-rw-r--r-- | src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp | 132 | ||||
-rw-r--r-- | src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp | 44 | ||||
-rw-r--r-- | src/game/SpellEffects.cpp | 2 |
3 files changed, 89 insertions, 89 deletions
diff --git a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp index 8e1b664cfd9..1b581bf65a9 100644 --- a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp +++ b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp @@ -167,91 +167,91 @@ CreatureAI* GetAI_npc_kyle_frenzied(Creature *_Creature) float wp_plain_vision[50][3] = { {-2226.32, -408.095, -9.36235}, - {-2203.04, -437.212, -5.72498}, - {-2163.91, -457.851, -7.09049}, - {-2123.87, -448.137, -9.29591}, - {-2104.66, -427.166, -6.49513}, - {-2101.48, -422.826, -5.3567}, - {-2097.56, -417.083, -7.16716}, - {-2084.87, -398.626, -9.88973}, - {-2072.71, -382.324, -10.2488}, - {-2054.05, -356.728, -6.22468}, - {-2051.8, -353.645, -5.35791}, - {-2049.08, -349.912, -6.15723}, - {-2030.6, -310.724, -9.59302}, - {-2002.15, -249.308, -10.8124}, - {-1972.85, -195.811, -10.6316}, - {-1940.93, -147.652, -11.7055}, - {-1888.06, -81.943, -11.4404}, - {-1837.05, -34.0109, -12.258}, - {-1796.12, -14.6462, -10.3581}, - {-1732.61, -4.27746, -10.0213}, - {-1688.94, -0.829945, -11.7103}, - {-1681.32, 13.0313, -9.48056}, - {-1677.04, 36.8349, -7.10318}, - {-1675.2, 68.559, -8.95384}, - {-1676.57, 89.023, -9.65104}, - {-1678.16, 110.939, -10.1782}, - {-1677.86, 128.681, -5.73869}, - {-1675.27, 144.324, -3.47916}, - {-1671.7, 163.169, -1.23098}, - {-1666.61, 181.584, 5.26145}, - {-1661.51, 196.154, 8.95252}, - {-1655.47, 210.811, 8.38727}, - {-1647.07, 226.947, 5.27755}, - {-1621.65, 232.91, 2.69579}, - {-1600.23, 237.641, 2.98539}, - {-1576.07, 242.546, 4.66541}, - {-1554.57, 248.494, 6.60377}, - {-1547.53, 259.302, 10.6741}, - {-1541.7, 269.847, 16.4418}, - {-1539.83, 278.989, 21.0597}, - {-1540.16, 290.219, 27.8247}, - {-1538.99, 298.983, 34.0032}, - {-1540.38, 307.337, 41.3557}, - {-1536.61, 314.884, 48.0179}, - {-1532.42, 323.277, 55.6667}, - {-1528.77, 329.774, 61.1525}, - {-1525.65, 333.18, 63.2161}, - {-1517.01, 350.713, 62.4286}, - {-1511.39, 362.537, 62.4539}, - {-1508.68, 366.822, 62.733} + {-2203.04, -437.212, -5.72498}, + {-2163.91, -457.851, -7.09049}, + {-2123.87, -448.137, -9.29591}, + {-2104.66, -427.166, -6.49513}, + {-2101.48, -422.826, -5.3567}, + {-2097.56, -417.083, -7.16716}, + {-2084.87, -398.626, -9.88973}, + {-2072.71, -382.324, -10.2488}, + {-2054.05, -356.728, -6.22468}, + {-2051.8, -353.645, -5.35791}, + {-2049.08, -349.912, -6.15723}, + {-2030.6, -310.724, -9.59302}, + {-2002.15, -249.308, -10.8124}, + {-1972.85, -195.811, -10.6316}, + {-1940.93, -147.652, -11.7055}, + {-1888.06, -81.943, -11.4404}, + {-1837.05, -34.0109, -12.258}, + {-1796.12, -14.6462, -10.3581}, + {-1732.61, -4.27746, -10.0213}, + {-1688.94, -0.829945, -11.7103}, + {-1681.32, 13.0313, -9.48056}, + {-1677.04, 36.8349, -7.10318}, + {-1675.2, 68.559, -8.95384}, + {-1676.57, 89.023, -9.65104}, + {-1678.16, 110.939, -10.1782}, + {-1677.86, 128.681, -5.73869}, + {-1675.27, 144.324, -3.47916}, + {-1671.7, 163.169, -1.23098}, + {-1666.61, 181.584, 5.26145}, + {-1661.51, 196.154, 8.95252}, + {-1655.47, 210.811, 8.38727}, + {-1647.07, 226.947, 5.27755}, + {-1621.65, 232.91, 2.69579}, + {-1600.23, 237.641, 2.98539}, + {-1576.07, 242.546, 4.66541}, + {-1554.57, 248.494, 6.60377}, + {-1547.53, 259.302, 10.6741}, + {-1541.7, 269.847, 16.4418}, + {-1539.83, 278.989, 21.0597}, + {-1540.16, 290.219, 27.8247}, + {-1538.99, 298.983, 34.0032}, + {-1540.38, 307.337, 41.3557}, + {-1536.61, 314.884, 48.0179}, + {-1532.42, 323.277, 55.6667}, + {-1528.77, 329.774, 61.1525}, + {-1525.65, 333.18, 63.2161}, + {-1517.01, 350.713, 62.4286}, + {-1511.39, 362.537, 62.4539}, + {-1508.68, 366.822, 62.733} }; - + struct TRINITY_DLL_DECL npc_plains_visionAI : public ScriptedAI -{ - npc_plains_visionAI(Creature *c) : ScriptedAI(c) {Reset();} - +{ + npc_plains_visionAI(Creature *c) : ScriptedAI(c) {Reset();} + bool newWaypoint; uint8 WayPointId; uint8 amountWP; - - void Reset() - { + + void Reset() + { WayPointId = 0; newWaypoint = true; amountWP = 49; } - + void Aggro(Unit* who){} - + void MovementInform(uint32 type, uint32 id) { if(type != POINT_MOTION_TYPE) return; - - if (id < amountWP) + + if (id < amountWP) { ++WayPointId; newWaypoint = true; } - else + else { m_creature->setDeathState(JUST_DIED); m_creature->RemoveCorpse(); - } + } } - + void UpdateAI(const uint32 diff) { if (newWaypoint) @@ -259,16 +259,16 @@ struct TRINITY_DLL_DECL npc_plains_visionAI : public ScriptedAI m_creature->GetMotionMaster()->MovePoint(WayPointId, wp_plain_vision[WayPointId][0], wp_plain_vision[WayPointId][1], wp_plain_vision[WayPointId][2]); newWaypoint = false; } - } + } }; CreatureAI* GetAI_npc_plains_vision(Creature *_Creature) { - return new npc_plains_visionAI (_Creature); + return new npc_plains_visionAI (_Creature); } /*##### -# +# ######*/ void AddSC_mulgore() diff --git a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp index f940ee53481..62ca98928e6 100644 --- a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp +++ b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp @@ -102,7 +102,7 @@ bool QuestAccept_npc_swiftmountain(Player* player, Creature* creature, Quest con if (quest->GetQuestId() == QUEST_HOMEWARD_BOUND) { ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID()); - DoScriptText(SAY_READY, creature, player); + DoScriptText(SAY_READY, creature, player); creature->setFaction(113); } @@ -193,9 +193,9 @@ CreatureAI* GetAI_npc_swiftmountain(Creature *_Creature) # npc_plucky ######*/ -#define GOSSIP_P "<Learn Secret phrase>" +#define GOSSIP_P "<Learn Secret phrase>" -#define SPELL_TRANSFORM_HUMAN 9192 +#define SPELL_TRANSFORM_HUMAN 9192 #define QUEST_GET_THE_SCOOP 1950 struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI @@ -209,45 +209,45 @@ struct TRINITY_DLL_DECL npc_pluckyAI : public ScriptedAI uint32 ChickenTimer; void Reset() { - + Transformed = false; Chicken = false; m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); Timer = 0; ChickenTimer = 0; } - + void Aggro(Unit *who){} - - void TransformHuman(uint32 emoteid) - { - if (!Transformed) + + void TransformHuman(uint32 emoteid) + { + if (!Transformed) { Transformed = true; DoCast(m_creature, SPELL_TRANSFORM_HUMAN); Timer = 120000; if (emoteid == TEXTEMOTE_BECKON) m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - else + else { ChickenTimer = 1500; Chicken = true; } - } + } } - - void UpdateAI(const uint32 diff) - { - if (Transformed) + + void UpdateAI(const uint32 diff) + { + if (Transformed) { - if (Timer < diff) + if (Timer < diff) Reset(); else Timer-=diff; } - - if(Chicken) + + if(Chicken) { - if (ChickenTimer < diff) + if (ChickenTimer < diff) { m_creature->HandleEmoteCommand(EMOTE_ONESHOT_WAVE); Chicken = false; @@ -269,7 +269,7 @@ bool ReceiveEmote_npc_plucky( Player *player, Creature *_Creature, uint32 emote _Creature->SetInFront(player); ((npc_pluckyAI*)((Creature*)_Creature)->AI())->TransformHuman(emote); } - + return true; } @@ -278,7 +278,7 @@ bool GossipHello_npc_plucky(Player *player, Creature *_Creature) if(player->GetQuestStatus(QUEST_GET_THE_SCOOP) == QUEST_STATUS_INCOMPLETE) player->ADD_GOSSIP_ITEM(0, GOSSIP_P, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(738, _Creature->GetGUID()); - + return true; } @@ -300,7 +300,7 @@ return new npc_pluckyAI(_Creature); } /*##### -# +# ######*/ void AddSC_thousand_needles() diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index db4df9a5862..92a73ffbdb4 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -4996,7 +4996,7 @@ void Spell::EffectScriptEffect(uint32 effIndex) } case 47977: // Magic Broom { - if(!unitTarget) + if(!unitTarget) return; if(unitTarget) |