diff options
| author | click <clickvd@gonnamakeyou.com> | 2011-06-11 22:35:29 +0200 |
|---|---|---|
| committer | click <clickvd@gonnamakeyou.com> | 2011-06-11 22:35:29 +0200 |
| commit | 158966dc793f47dd4ada264da775f647601298aa (patch) | |
| tree | 8fa1dc1cc36d07123662c32eb5981cfac01e91b6 /src/server/scripts/World | |
| parent | 9ef8bd307200445f448a67d1bb26c3afee9b7051 (diff) | |
Core: Codestyle cleanup
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 20 | ||||
| -rw-r--r-- | src/server/scripts/World/item_scripts.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 32 |
3 files changed, 29 insertions, 29 deletions
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index fc0c8f058af..4ebb0fc3aea 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -65,7 +65,7 @@ class go_cat_figurine : public GameObjectScript public: go_cat_figurine() : GameObjectScript("go_cat_figurine") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { pPlayer->CastSpell(pPlayer, SPELL_SUMMON_GHOST_SABER, true); return false; @@ -144,7 +144,7 @@ class go_barov_journal : public GameObjectScript public: go_barov_journal() : GameObjectScript("go_barov_journal") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086)) { @@ -163,7 +163,7 @@ class go_field_repair_bot_74A : public GameObjectScript public: go_field_repair_bot_74A() : GameObjectScript("go_field_repair_bot_74A") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704)) { @@ -210,7 +210,7 @@ class go_orb_of_command : public GameObjectScript public: go_orb_of_command() : GameObjectScript("go_orb_of_command") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(7761)) pPlayer->CastSpell(pPlayer, 23460, true); @@ -228,7 +228,7 @@ class go_tablet_of_madness : public GameObjectScript public: go_tablet_of_madness() : GameObjectScript("go_tablet_of_madness") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266)) { @@ -269,7 +269,7 @@ class go_jump_a_tron : public GameObjectScript public: go_jump_a_tron() : GameObjectScript("go_jump_a_tron") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) pPlayer->CastSpell(pPlayer, 33382, true); @@ -379,7 +379,7 @@ class go_resonite_cask : public GameObjectScript public: go_resonite_cask() : GameObjectScript("go_resonite_cask") { } - bool OnGossipHello(Player * /*pPlayer*/, GameObject *pGO) + bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGO) { if (pGO->GetGoType() == GAMEOBJECT_TYPE_GOOBER) pGO->SummonCreature(NPC_GOGGEROC, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 300000); @@ -470,7 +470,7 @@ class go_southfury_moonstone : public GameObjectScript public: go_southfury_moonstone() : GameObjectScript("go_southfury_moonstone") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose //pPlayer->CastSpell(pPlayer, SPELL_SUMMON_RIZZLE, false); @@ -498,7 +498,7 @@ class go_tele_to_dalaran_crystal : public GameObjectScript public: go_tele_to_dalaran_crystal() : GameObjectScript("go_tele_to_dalaran_crystal") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_TELE_CRYSTAL_FLAG)) { @@ -520,7 +520,7 @@ class go_tele_to_violet_stand : public GameObjectScript public: go_tele_to_violet_stand() : GameObjectScript("go_tele_to_violet_stand") { } - bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/) + bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestRewardStatus(QUEST_LEARN_LEAVE_RETURN) || pPlayer->GetQuestStatus(QUEST_LEARN_LEAVE_RETURN) == QUEST_STATUS_INCOMPLETE) return false; diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index 4b15cc79dd9..c6a74841fd1 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -190,7 +190,7 @@ class item_mysterious_egg : public ItemScript { public: item_mysterious_egg() : ItemScript("item_mysterious_egg") { } - bool OnExpire(Player *pPlayer, ItemTemplate const * /*pItemProto*/) + bool OnExpire(Player *pPlayer, ItemTemplate const* /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg @@ -210,7 +210,7 @@ class item_disgusting_jar : public ItemScript public: item_disgusting_jar() : ItemScript("item_disgusting_jar") {} - bool OnExpire(Player *pPlayer, ItemTemplate const * /*pItemProto*/) + bool OnExpire(Player *pPlayer, ItemTemplate const* /*pItemProto*/) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar @@ -259,7 +259,7 @@ class item_pile_fake_furs : public ItemScript public: item_pile_fake_furs() : ItemScript("item_pile_fake_furs") { } - bool OnUse(Player *pPlayer, Item * /*pItem*/, SpellCastTargets const & /*targets*/) + bool OnUse(Player *pPlayer, Item* /*pItem*/, SpellCastTargets const & /*targets*/) { GameObject *pGo = NULL; for (uint8 i = 0; i < CaribouTrapsNum; ++i) diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index c78bbb2bdd8..671892e9ef2 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -330,7 +330,7 @@ public: me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -922,7 +922,7 @@ public: me->SetHealth(me->CountPctFromMaxHealth(70)); } - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void SpellHit(Unit* pCaster, const SpellEntry *Spell) { @@ -1094,7 +1094,7 @@ public: me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { } @@ -1507,7 +1507,7 @@ public: npc_steam_tonkAI(Creature *c) : ScriptedAI(c) {} void Reset() {} - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void OnPossess(bool apply) { @@ -1552,9 +1552,9 @@ public: ExplosionTimer = 3000; } - void EnterCombat(Unit * /*who*/) {} - void AttackStart(Unit * /*who*/) {} - void MoveInLineOfSight(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} + void AttackStart(Unit* /*who*/) {} + void MoveInLineOfSight(Unit* /*who*/) {} void UpdateAI(const uint32 diff) { @@ -1668,7 +1668,7 @@ public: uint32 SpellTimer; bool IsViper; - void EnterCombat(Unit * /*who*/) {} + void EnterCombat(Unit* /*who*/) {} void Reset() { @@ -1689,7 +1689,7 @@ public: // Start attacking attacker of owner on first ai update after spawn - move in line of sight may choose better target if (!me->getVictim() && me->isSummon()) - if (Unit * Owner = me->ToTempSummon()->GetSummoner()) + if (Unit* Owner = me->ToTempSummon()->GetSummoner()) if (Owner->getAttackerForHelper()) AttackStart(Owner->getAttackerForHelper()); } @@ -1781,7 +1781,7 @@ public: if (Unit* own = me->GetOwner()) me->GetMotionMaster()->MoveFollow(own, 0, 0); } - void EnterCombat(Unit * /*who*/){} + void EnterCombat(Unit* /*who*/){} void UpdateAI(const uint32 diff) { if (me->HasAura(20372)) @@ -1851,7 +1851,7 @@ public: void InitializeAI() { CasterAI::InitializeAI(); - Unit * owner = me->GetOwner(); + Unit* owner = me->GetOwner(); if (!owner) return; // Inherit Master's Threat List (not yet implemented) @@ -1899,7 +1899,7 @@ public: void InitializeAI() { CasterAI::InitializeAI(); - Unit * owner = me->GetOwner(); + Unit* owner = me->GetOwner(); if (!owner) return; // Not needed to be despawned now @@ -1917,7 +1917,7 @@ public: } } - void JustDied(Unit * /*killer*/) + void JustDied(Unit* /*killer*/) { // Stop Feeding Gargoyle when it dies if (Unit *owner = me->GetOwner()) @@ -2037,13 +2037,13 @@ public: Reset(); } - void DamageTaken(Unit * /*done_by*/, uint32 &damage) + void DamageTaken(Unit* /*done_by*/, uint32 &damage) { uiResetTimer = 5000; damage = 0; } - void EnterCombat(Unit * /*who*/) + void EnterCombat(Unit* /*who*/) { if (uiEntry != NPC_ADVANCED_TARGET_DUMMY && uiEntry != NPC_TARGET_DUMMY) return; @@ -2076,7 +2076,7 @@ public: uiDespawnTimer -= uiDiff; } } - void MoveInLineOfSight(Unit * /*who*/){return;} + void MoveInLineOfSight(Unit* /*who*/){return;} }; CreatureAI* GetAI(Creature* pCreature) const |
