From 68c015af4429f72b54d2378c74c11a94a320aa1d Mon Sep 17 00:00:00 2001 From: Kudlaty Date: Sat, 15 Aug 2009 00:32:04 +0200 Subject: Merge [SD2] r1284 Apply SD2 code style to all uint32 arguments in gossip related functions. r1285 Replace all remains of _GO with proper pointer style. Aslo some other code style. Fix typo in world_scripts_full.sql. thx Sundark --HG-- branch : trunk --- src/bindings/scripts/ScriptMgr.cpp | 194 ++++---- .../scripts/scripts/creature/simple_ai.cpp | 2 +- .../scripts/scripts/custom/custom_example.cpp | 14 +- .../scripts/custom/custom_gossip_codebox.cpp | 10 +- .../scripts/scripts/custom/npc_acherus_taxi.cpp | 4 +- .../scripts/custom/npc_wyrmresttempel_taxi.cpp | 18 +- src/bindings/scripts/scripts/custom/test.cpp | 8 +- .../scripts/scripts/examples/example_creature.cpp | 4 +- .../scripts/scripts/examples/example_escort.cpp | 2 +- src/bindings/scripts/scripts/go/go_scripts.cpp | 42 +- src/bindings/scripts/scripts/guard/guards.cpp | 512 ++++++++++----------- src/bindings/scripts/scripts/npc/npc_innkeeper.cpp | 4 +- .../scripts/scripts/npc/npc_professions.cpp | 146 +++--- src/bindings/scripts/scripts/npc/npc_taxi.cpp | 6 +- src/bindings/scripts/scripts/npc/npcs_special.cpp | 44 +- .../azjol_nerub/ahnkahet/instance_ahnkahet.cpp | 14 +- .../azjol_nerub/instance_azjol_nerub.cpp | 10 +- .../scripts/scripts/zone/azshara/azshara.cpp | 10 +- .../scripts/zone/azuremyst_isle/azuremyst_isle.cpp | 6 +- .../scripts/scripts/zone/barrens/the_barrens.cpp | 8 +- .../scripts/zone/black_temple/black_temple.cpp | 4 +- .../scripts/zone/black_temple/boss_illidan.cpp | 30 +- .../zone/black_temple/boss_shade_of_akama.cpp | 6 +- .../zone/black_temple/boss_warlord_najentus.cpp | 8 +- .../scripts/zone/black_temple/illidari_council.cpp | 4 +- .../zone/black_temple/instance_black_temple.cpp | 76 +-- .../zone/blackrock_depths/blackrock_depths.cpp | 28 +- .../zone/blackrock_depths/boss_tomb_of_seven.cpp | 8 +- .../blackrock_depths/instance_blackrock_depths.cpp | 66 +-- .../zone/blackwing_lair/boss_vaelastrasz.cpp | 10 +- .../zone/blackwing_lair/boss_victor_nefarius.cpp | 6 +- .../blades_edge_mountains.cpp | 18 +- .../scripts/zone/blasted_lands/blasted_lands.cpp | 8 +- .../scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp | 4 +- .../zone/burning_steppes/burning_steppes.cpp | 4 +- .../caverns_of_time/dark_portal/dark_portal.cpp | 6 +- .../dark_portal/instance_dark_portal.cpp | 6 +- .../zone/caverns_of_time/hyjal/boss_anetheron.cpp | 11 +- .../zone/caverns_of_time/hyjal/boss_archimonde.cpp | 2 +- .../zone/caverns_of_time/hyjal/boss_azgalor.cpp | 8 +- .../zone/caverns_of_time/hyjal/boss_kazrogal.cpp | 8 +- .../hyjal/boss_rage_winterchill.cpp | 8 +- .../scripts/zone/caverns_of_time/hyjal/hyjal.cpp | 12 +- .../scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp | 4 +- .../zone/caverns_of_time/hyjal/hyjal_trash.cpp | 72 +-- .../zone/caverns_of_time/hyjal/instance_hyjal.cpp | 38 +- .../old_hillsbrad/instance_old_hillsbrad.cpp | 10 +- .../old_hillsbrad/old_hillsbrad.cpp | 20 +- .../serpent_shrine/boss_lady_vashj.cpp | 2 +- .../serpent_shrine/boss_leotheras_the_blind.cpp | 2 +- .../serpent_shrine/instance_serpent_shrine.cpp | 46 +- .../steam_vault/instance_steam_vault.cpp | 28 +- .../scripts/scripts/zone/darkshore/darkshore.cpp | 4 +- .../scripts/scripts/zone/deadmines/deadmines.cpp | 16 +- .../eastern_plaguelands/eastern_plaguelands.cpp | 8 +- .../eastern_plaguelands/the_scarlet_enclave.cpp | 4 +- .../scripts/zone/eversong_woods/eversong_woods.cpp | 14 +- .../scripts/scripts/zone/felwood/felwood.cpp | 4 +- .../scripts/scripts/zone/feralas/feralas.cpp | 6 +- .../scripts/scripts/zone/ghostlands/ghostlands.cpp | 14 +- .../zone/gruuls_lair/instance_gruuls_lair.cpp | 24 +- .../blood_furnace/instance_blood_furnace.cpp | 70 +-- .../instance_hellfire_ramparts.cpp | 8 +- .../magtheridons_lair/boss_magtheridon.cpp | 8 +- .../instance_magtheridons_lair.cpp | 18 +- .../shattered_halls/boss_nethekurse.cpp | 2 +- .../shattered_halls/instance_shattered_halls.cpp | 12 +- .../zone/hellfire_peninsula/hellfire_peninsula.cpp | 4 +- .../scripts/scripts/zone/ironforge/ironforge.cpp | 4 +- .../scripts/zone/karazhan/boss_midnight.cpp | 2 +- .../scripts/scripts/zone/karazhan/bosses_opera.cpp | 4 +- .../scripts/zone/karazhan/instance_karazhan.cpp | 46 +- .../scripts/scripts/zone/karazhan/karazhan.cpp | 8 +- .../scripts/scripts/zone/loch_modan/loch_modan.cpp | 4 +- .../magisters_terrace/boss_priestess_delrissa.cpp | 4 +- .../magisters_terrace/boss_selin_fireheart.cpp | 2 +- .../instance_magisters_terrace.cpp | 28 +- .../zone/molten_core/instance_molten_core.cpp | 46 +- .../scripts/scripts/zone/moonglade/moonglade.cpp | 16 +- .../scripts/scripts/zone/mulgore/mulgore.cpp | 4 +- .../scripts/scripts/zone/nagrand/nagrand.cpp | 18 +- .../scripts/zone/naxxramas/boss_kelthuzad.cpp | 2 +- .../scripts/zone/naxxramas/boss_sapphiron.cpp | 10 +- .../scripts/zone/naxxramas/instance_naxxramas.cpp | 36 +- .../scripts/zone/netherstorm/netherstorm.cpp | 48 +- .../scripts/zone/nexus/nexus/instance_nexus.cpp | 16 +- .../zone/obsidian_sanctum/boss_sartharion.cpp | 2 +- .../scripts/scripts/zone/orgrimmar/orgrimmar.cpp | 14 +- .../scripts/zone/razorfen_downs/razorfen_downs.cpp | 6 +- .../razorfen_kraul/instance_razorfen_kraul.cpp | 6 +- .../scripts/zone/razorfen_kraul/razorfen_kraul.cpp | 8 +- .../instance_scarlet_monastery.cpp | 24 +- .../zone/scholomance/instance_scholomance.cpp | 20 +- .../scripts/zone/searing_gorge/searing_gorge.cpp | 12 +- .../shadowfang_keep/instance_shadowfang_keep.cpp | 10 +- .../zone/shadowmoon_valley/shadowmoon_valley.cpp | 30 +- .../scripts/zone/shattrath/shattrath_city.cpp | 60 +-- .../scripts/zone/sholazar_basin/sholazar_basin.cpp | 4 +- .../scripts/scripts/zone/silithus/silithus.cpp | 8 +- .../zone/silverpine_forest/silverpine_forest.cpp | 4 +- .../stonetalon_mountains/stonetalon_mountains.cpp | 6 +- .../scripts/zone/stormwind/stormwind_city.cpp | 8 +- .../zone/stratholme/instance_stratholme.cpp | 48 +- .../scripts/scripts/zone/stratholme/stratholme.cpp | 10 +- .../scripts/zone/sunwell_plateau/boss_kalecgos.cpp | 2 +- .../zone/sunwell_plateau/boss_kiljaeden.cpp | 22 +- .../sunwell_plateau/instance_sunwell_plateau.cpp | 46 +- .../scripts/scripts/zone/tanaris/tanaris.cpp | 14 +- .../tempest_keep/arcatraz/instance_arcatraz.cpp | 28 +- .../zone/tempest_keep/the_eye/instance_the_eye.cpp | 18 +- .../instance_temple_of_ahnqiraj.cpp | 14 +- .../zone/terokkar_forest/terokkar_forest.cpp | 26 +- .../zone/thousand_needles/thousand_needles.cpp | 4 +- .../scripts/zone/thunder_bluff/thunder_bluff.cpp | 4 +- .../scripts/zone/uldaman/boss_archaedas.cpp | 8 +- .../scripts/zone/uldaman/instance_uldaman.cpp | 50 +- .../scripts/scripts/zone/uldaman/uldaman.cpp | 4 +- .../scripts/scripts/zone/undercity/undercity.cpp | 6 +- .../scripts/zone/ungoro_crater/ungoro_crater.cpp | 10 +- .../utgarde_keep/instance_utgarde_keep.cpp | 34 +- .../instance_vault_of_archavon.cpp | 8 +- .../wailing_caverns/instance_wailing_caverns.cpp | 6 +- .../zone/wailing_caverns/wailing_caverns.cpp | 4 +- .../western_plaguelands/western_plaguelands.cpp | 8 +- .../scripts/zone/winterspring/winterspring.cpp | 12 +- .../scripts/zone/zangarmarsh/zangarmarsh.cpp | 18 +- .../scripts/scripts/zone/zulaman/boss_janalai.cpp | 6 +- .../scripts/zone/zulaman/instance_zulaman.cpp | 30 +- .../scripts/scripts/zone/zulaman/zulaman.cpp | 4 +- .../scripts/scripts/zone/zulfarrak/zulfarrak.cpp | 8 +- 130 files changed, 1404 insertions(+), 1405 deletions(-) (limited to 'src') diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index 67c31cd496d..09c1605f866 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -687,14 +687,14 @@ void LoadDatabase() //Get db string from file std::string dbstring = TScriptConfig.GetStringDefault("WorldDatabaseInfo", ""); - if (dbstring.empty() ) + if (dbstring.empty()) { error_log("TSCR: Missing world database info from configuration file. Load database aborted."); return; } //Initialize connection to DB - if (!dbstring.empty() && TScriptDB.Initialize(dbstring.c_str()) ) + if (!dbstring.empty() && TScriptDB.Initialize(dbstring.c_str())) outstring_log("TSCR: TrinityScript database: %s",dbstring.c_str()); else { @@ -764,14 +764,14 @@ void LoadDatabase() if (temp.SoundId) { if (!GetSoundEntriesStore()->LookupEntry(temp.SoundId)) - error_db_log("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.",i,temp.SoundId); + error_db_log("TSCR: Entry %i in table `script_texts` has soundId %u but sound does not exist.",i, temp.SoundId); } if (!GetLanguageDescByID(temp.Language)) - error_db_log("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.",i,temp.Language); + error_db_log("TSCR: Entry %i in table `script_texts` using Language %u but Language does not exist.",i, temp.Language); if (temp.Type > CHAT_TYPE_ZONE_YELL) - error_db_log("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.",i,temp.Type); + error_db_log("TSCR: Entry %i in table `script_texts` has Type %u but this Chat Type does not exist.",i, temp.Type); TextMap[i] = temp; ++count; @@ -829,14 +829,14 @@ void LoadDatabase() if (temp.SoundId) { if (!GetSoundEntriesStore()->LookupEntry(temp.SoundId)) - error_db_log("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.",i,temp.SoundId); + error_db_log("TSCR: Entry %i in table `custom_texts` has soundId %u but sound does not exist.",i, temp.SoundId); } if (!GetLanguageDescByID(temp.Language)) - error_db_log("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.",i,temp.Language); + error_db_log("TSCR: Entry %i in table `custom_texts` using Language %u but Language does not exist.",i, temp.Language); if (temp.Type > CHAT_TYPE_ZONE_YELL) - error_db_log("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.",i,temp.Type); + error_db_log("TSCR: Entry %i in table `custom_texts` has Type %u but this Chat Type does not exist.",i, temp.Type); TextMap[i] = temp; ++count; @@ -1655,7 +1655,7 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target) if((*i).second.SoundId) { - if( GetSoundEntriesStore()->LookupEntry((*i).second.SoundId) ) + if(GetSoundEntriesStore()->LookupEntry((*i).second.SoundId)) { pSource->SendPlaySound((*i).second.SoundId, false); } @@ -1670,7 +1670,7 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target) ((Unit*)pSource)->HandleEmoteCommand((*i).second.Emote); } else - error_log("TSCR: DoScriptText entry %i tried to process emote for invalid TypeId (%u).",textEntry,pSource->GetTypeId()); + error_log("TSCR: DoScriptText entry %i tried to process emote for invalid TypeId (%u).",textEntry, pSource->GetTypeId()); } switch((*i).second.Type) @@ -1732,242 +1732,242 @@ char const* ScriptsVersion() return "Default Trinity scripting library"; } TRINITY_DLL_EXPORT -bool GossipHello ( Player * player, Creature *_Creature ) +bool GossipHello (Player * pPlayer, Creature* pCreature) { - Script *tmpscript = m_scripts[_Creature->GetScriptId()]; + Script *tmpscript = m_scripts[pCreature->GetScriptId()]; if (!tmpscript || !tmpscript->pGossipHello) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pGossipHello(player,_Creature); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pGossipHello(pPlayer, pCreature); } TRINITY_DLL_EXPORT -bool GossipSelect( Player *player, Creature *_Creature, uint32 sender, uint32 action ) +bool GossipSelect(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action); + debug_log("TSCR: Gossip selection, sender: %d, action: %d", uiSender, uiAction); - Script *tmpscript = m_scripts[_Creature->GetScriptId()]; + Script *tmpscript = m_scripts[pCreature->GetScriptId()]; if (!tmpscript || !tmpscript->pGossipSelect) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pGossipSelect(player,_Creature,sender,action); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pGossipSelect(pPlayer, pCreature, uiSender, uiAction); } TRINITY_DLL_EXPORT -bool GossipSelectWithCode( Player *player, Creature *_Creature, uint32 sender, uint32 action, const char* sCode ) +bool GossipSelectWithCode(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction, const char* sCode) { - debug_log("TSCR: Gossip selection with code, sender: %d, action: %d",sender, action); + debug_log("TSCR: Gossip selection with code, sender: %d, action: %d", uiSender, uiAction); - Script *tmpscript = m_scripts[_Creature->GetScriptId()]; + Script *tmpscript = m_scripts[pCreature->GetScriptId()]; if (!tmpscript || !tmpscript->pGossipSelectWithCode) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pGossipSelectWithCode(player,_Creature,sender,action,sCode); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pGossipSelectWithCode(pPlayer, pCreature, uiSender, uiAction, sCode); } TRINITY_DLL_EXPORT -bool GOSelect( Player *player, GameObject *_GO, uint32 sender, uint32 action ) +bool GOSelect(Player* pPlayer, GameObject* pGO, uint32 uiSender, uint32 uiAction) { - if(!_GO) + if(!pGO) return false; - debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action); + debug_log("TSCR: Gossip selection, sender: %d, action: %d", uiSender, uiAction); - Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId]; + Script *tmpscript = m_scripts[pGO->GetGOInfo()->ScriptId]; if(!tmpscript || !tmpscript->pGOSelect) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pGOSelect(player,_GO,sender,action); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pGOSelect(pPlayer, pGO, uiSender, uiAction); } TRINITY_DLL_EXPORT -bool GOSelectWithCode( Player *player, GameObject *_GO, uint32 sender, uint32 action, const char* sCode ) +bool GOSelectWithCode(Player* pPlayer, GameObject* pGO, uint32 uiSender, uint32 uiAction, const char* sCode) { - if(!_GO) + if(!pGO) return false; - debug_log("TSCR: Gossip selection, sender: %d, action: %d",sender, action); + debug_log("TSCR: Gossip selection, sender: %d, action: %d",uiSender, uiAction); - Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId]; + Script *tmpscript = m_scripts[pGO->GetGOInfo()->ScriptId]; if(!tmpscript || !tmpscript->pGOSelectWithCode) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pGOSelectWithCode(player,_GO,sender,action,sCode); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pGOSelectWithCode(pPlayer, pGO, uiSender ,uiAction, sCode); } TRINITY_DLL_EXPORT -bool QuestAccept( Player *player, Creature *_Creature, Quest const *_Quest ) +bool QuestAccept(Player* pPlayer, Creature* pCreature, Quest const* pQuest) { - Script *tmpscript = m_scripts[_Creature->GetScriptId()]; + Script *tmpscript = m_scripts[pCreature->GetScriptId()]; if (!tmpscript || !tmpscript->pQuestAccept) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pQuestAccept(player,_Creature,_Quest); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pQuestAccept(pPlayer, pCreature, pQuest); } TRINITY_DLL_EXPORT -bool QuestSelect( Player *player, Creature *_Creature, Quest const *_Quest ) +bool QuestSelect(Player* pPlayer, Creature* pCreature, Quest const* pQuest) { - Script *tmpscript = m_scripts[_Creature->GetScriptId()]; + Script *tmpscript = m_scripts[pCreature->GetScriptId()]; if (!tmpscript || !tmpscript->pQuestSelect) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pQuestSelect(player,_Creature,_Quest); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pQuestSelect(pPlayer, pCreature, pQuest); } TRINITY_DLL_EXPORT -bool QuestComplete( Player *player, Creature *_Creature, Quest const *_Quest ) +bool QuestComplete(Player* pPlayer, Creature* pCreature, Quest const* pQuest) { - Script *tmpscript = m_scripts[_Creature->GetScriptId()]; + Script *tmpscript = m_scripts[pCreature->GetScriptId()]; if (!tmpscript || !tmpscript->pQuestComplete) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pQuestComplete(player,_Creature,_Quest); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pQuestComplete(pPlayer, pCreature, pQuest); } TRINITY_DLL_EXPORT -bool ChooseReward( Player *player, Creature *_Creature, Quest const *_Quest, uint32 opt ) +bool ChooseReward(Player* pPlayer, Creature* pCreature, Quest const* pQuest, uint32 opt) { - Script *tmpscript = m_scripts[_Creature->GetScriptId()]; + Script *tmpscript = m_scripts[pCreature->GetScriptId()]; if (!tmpscript || !tmpscript->pChooseReward) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pChooseReward(player,_Creature,_Quest,opt); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pChooseReward(pPlayer, pCreature, pQuest, opt); } TRINITY_DLL_EXPORT -uint32 NPCDialogStatus( Player *player, Creature *_Creature ) +uint32 NPCDialogStatus(Player* pPlayer, Creature* pCreature) { - Script *tmpscript = m_scripts[_Creature->GetScriptId()]; + Script *tmpscript = m_scripts[pCreature->GetScriptId()]; if (!tmpscript || !tmpscript->pNPCDialogStatus) return 100; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pNPCDialogStatus(player,_Creature); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pNPCDialogStatus(pPlayer, pCreature); } TRINITY_DLL_EXPORT -uint32 GODialogStatus( Player *player, GameObject *_GO ) +uint32 GODialogStatus(Player* pPlayer, GameObject* pGO) { - Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId]; + Script *tmpscript = m_scripts[pGO->GetGOInfo()->ScriptId]; if (!tmpscript || !tmpscript->pGODialogStatus) return 100; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pGODialogStatus(player,_GO); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pGODialogStatus(pPlayer, pGO); } TRINITY_DLL_EXPORT -bool ItemHello( Player *player, Item *_Item, Quest const *_Quest ) +bool ItemHello(Player* pPlayer, Item* pItem, Quest const* pQuest) { - Script *tmpscript = m_scripts[_Item->GetProto()->ScriptId]; + Script *tmpscript = m_scripts[pItem->GetProto()->ScriptId]; if (!tmpscript || !tmpscript->pItemHello) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pItemHello(player,_Item,_Quest); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pItemHello(pPlayer, pItem, pQuest); } TRINITY_DLL_EXPORT -bool ItemQuestAccept( Player *player, Item *_Item, Quest const *_Quest ) +bool ItemQuestAccept(Player* pPlayer, Item* pItem, Quest const* pQuest) { - Script *tmpscript = m_scripts[_Item->GetProto()->ScriptId]; + Script *tmpscript = m_scripts[pItem->GetProto()->ScriptId]; if (!tmpscript || !tmpscript->pItemQuestAccept) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pItemQuestAccept(player,_Item,_Quest); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pItemQuestAccept(pPlayer, pItem, pQuest); } TRINITY_DLL_EXPORT -bool GOHello( Player *player, GameObject *_GO ) +bool GOHello(Player* pPlayer, GameObject* pGO) { - Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId]; + Script *tmpscript = m_scripts[pGO->GetGOInfo()->ScriptId]; if (!tmpscript || !tmpscript->pGOHello) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pGOHello(player,_GO); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pGOHello(pPlayer, pGO); } TRINITY_DLL_EXPORT -bool GOQuestAccept( Player *player, GameObject *_GO, Quest const *_Quest ) +bool GOQuestAccept(Player* pPlayer, GameObject* pGO, Quest const* pQuest) { - Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId]; + Script *tmpscript = m_scripts[pGO->GetGOInfo()->ScriptId]; if (!tmpscript || !tmpscript->pGOQuestAccept) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pGOQuestAccept(player,_GO,_Quest); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pGOQuestAccept(pPlayer, pGO, pQuest); } TRINITY_DLL_EXPORT -bool GOChooseReward( Player *player, GameObject *_GO, Quest const *_Quest, uint32 opt ) +bool GOChooseReward(Player* pPlayer, GameObject* pGO, Quest const* pQuest, uint32 opt) { - Script *tmpscript = m_scripts[_GO->GetGOInfo()->ScriptId]; + Script *tmpscript = m_scripts[pGO->GetGOInfo()->ScriptId]; if (!tmpscript || !tmpscript->pGOChooseReward) return false; - player->PlayerTalkClass->ClearMenus(); - return tmpscript->pGOChooseReward(player,_GO,_Quest,opt); + pPlayer->PlayerTalkClass->ClearMenus(); + return tmpscript->pGOChooseReward(pPlayer, pGO, pQuest, opt); } TRINITY_DLL_EXPORT -bool AreaTrigger( Player *player, AreaTriggerEntry * atEntry) +bool AreaTrigger(Player* pPlayer, AreaTriggerEntry * atEntry) { Script *tmpscript = m_scripts[GetAreaTriggerScriptId(atEntry->id)]; if (!tmpscript || !tmpscript->pAreaTrigger) return false; - return tmpscript->pAreaTrigger(player, atEntry); + return tmpscript->pAreaTrigger(pPlayer, atEntry); } TRINITY_DLL_EXPORT -CreatureAI* GetAI(Creature *_Creature) +CreatureAI* GetAI(Creature* pCreature) { - Script *tmpscript = m_scripts[_Creature->GetScriptId()]; + Script *tmpscript = m_scripts[pCreature->GetScriptId()]; if (!tmpscript || !tmpscript->GetAI) return NULL; - return tmpscript->GetAI(_Creature); + return tmpscript->GetAI(pCreature); } TRINITY_DLL_EXPORT -bool ItemUse( Player *player, Item* _Item, SpellCastTargets const& targets) +bool ItemUse(Player* pPlayer, Item* pItem, SpellCastTargets const& targets) { - Script *tmpscript = m_scripts[_Item->GetProto()->ScriptId]; + Script *tmpscript = m_scripts[pItem->GetProto()->ScriptId]; if (!tmpscript || !tmpscript->pItemUse) return false; - return tmpscript->pItemUse(player,_Item,targets); + return tmpscript->pItemUse(pPlayer, pItem, targets); } TRINITY_DLL_EXPORT -bool ItemExpire( Player *player, ItemPrototype const * _ItemProto) +bool ItemExpire(Player* pPlayer, ItemPrototype const * pItemProto) { - Script *tmpscript = m_scripts[_ItemProto->ScriptId]; + Script *tmpscript = m_scripts[pItemProto->ScriptId]; if (!tmpscript || !tmpscript->pItemExpire) return true; - return tmpscript->pItemExpire(player,_ItemProto); + return tmpscript->pItemExpire(pPlayer, pItemProto); } TRINITY_DLL_EXPORT -bool EffectDummyCreature(Unit *caster, uint32 spellId, uint32 effIndex, Creature *crTarget ) +bool EffectDummyCreature(Unit *caster, uint32 spellId, uint32 effIndex, Creature *crTarget) { Script *tmpscript = m_scripts[crTarget->GetScriptId()]; if (!tmpscript || !tmpscript->pEffectDummyCreature) return false; - return tmpscript->pEffectDummyCreature(caster, spellId,effIndex,crTarget); + return tmpscript->pEffectDummyCreature(caster, spellId, effIndex, crTarget); } TRINITY_DLL_EXPORT -bool EffectDummyGameObj(Unit *caster, uint32 spellId, uint32 effIndex, GameObject *gameObjTarget ) +bool EffectDummyGameObj(Unit *caster, uint32 spellId, uint32 effIndex, GameObject *gameObjTarget) { Script *tmpscript = m_scripts[gameObjTarget->GetGOInfo()->ScriptId]; if (!tmpscript || !tmpscript->pEffectDummyGameObj) return false; - return tmpscript->pEffectDummyGameObj(caster, spellId,effIndex,gameObjTarget); + return tmpscript->pEffectDummyGameObj(caster, spellId, effIndex, gameObjTarget); } TRINITY_DLL_EXPORT -bool EffectDummyItem(Unit *caster, uint32 spellId, uint32 effIndex, Item *itemTarget ) +bool EffectDummyItem(Unit *caster, uint32 spellId, uint32 effIndex, Item *itemTarget) { Script *tmpscript = m_scripts[itemTarget->GetProto()->ScriptId]; if (!tmpscript || !tmpscript->pEffectDummyItem) return false; - return tmpscript->pEffectDummyItem(caster, spellId,effIndex,itemTarget); + return tmpscript->pEffectDummyItem(caster, spellId, effIndex, itemTarget); } TRINITY_DLL_EXPORT diff --git a/src/bindings/scripts/scripts/creature/simple_ai.cpp b/src/bindings/scripts/scripts/creature/simple_ai.cpp index a33f66fcef0..d4755cfac8b 100644 --- a/src/bindings/scripts/scripts/creature/simple_ai.cpp +++ b/src/bindings/scripts/scripts/creature/simple_ai.cpp @@ -250,7 +250,7 @@ void SimpleAI::UpdateAI(const uint32 diff) DoCast(target, Spell[i].Spell_Id); //Yell and sound use the same number so that you can make - //the creature yell with the correct sound effect attached + //the Creature yell with the correct sound effect attached uint32 random_text = rand()%3; //Random yell diff --git a/src/bindings/scripts/scripts/custom/custom_example.cpp b/src/bindings/scripts/scripts/custom/custom_example.cpp index 7a60ab7ef7e..5fec0646101 100644 --- a/src/bindings/scripts/scripts/custom/custom_example.cpp +++ b/src/bindings/scripts/scripts/custom/custom_example.cpp @@ -59,7 +59,7 @@ EndScriptData */ struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI { //*** HANDLED FUNCTION *** - //This is the constructor, called only once when the creature is first created + //This is the constructor, called only once when the Creature is first created custom_exampleAI(Creature *c) : ScriptedAI(c) {} //*** CUSTOM VARIABLES **** @@ -209,16 +209,16 @@ struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI }; //This is the GetAI method used by all scripts that involve AI -//It is called every time a new creature using this script is created +//It is called every time a new Creature using this script is created CreatureAI* GetAI_custom_example(Creature* pCreature) { return new custom_exampleAI (pCreature); } //This function is called when the player clicks an option on the gossip menu -void SendDefaultMenu_custom_example(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_custom_example(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) //Fight time { //Set our faction to hostile twoards all pCreature->setFaction(24); @@ -228,10 +228,10 @@ void SendDefaultMenu_custom_example(Player* pPlayer, Creature* pCreature, uint32 } //This function is called when the player clicks an option on the gossip menu -bool GossipSelect_custom_example(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_custom_example(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (sender == GOSSIP_SENDER_MAIN) - SendDefaultMenu_custom_example(pPlayer, pCreature, action); + if (uiSender == GOSSIP_SENDER_MAIN) + SendDefaultMenu_custom_example(pPlayer, pCreature, uiAction); return true; } diff --git a/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp b/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp index 3b7b2bd1a2c..226b95dfb3b 100644 --- a/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp +++ b/src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp @@ -35,9 +35,9 @@ bool GossipHello_custom_gossip_codebox(Player* pPlayer, Creature* pCreature) } //This function is called when the player clicks an option on the gossip menubool -bool GossipSelect_custom_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_custom_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+2) + if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { pCreature->Say("Normal select, guess you're not interested.", LANG_UNIVERSAL, 0); pPlayer->CLOSE_GOSSIP_MENU(); @@ -45,11 +45,11 @@ bool GossipSelect_custom_gossip_codebox(Player* pPlayer, Creature* pCreature, ui return true; } -bool GossipSelectWithCode_custom_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action, const char* sCode) +bool GossipSelectWithCode_custom_gossip_codebox(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction, const char* sCode) { - if (sender == GOSSIP_SENDER_MAIN) + if (uiSender == GOSSIP_SENDER_MAIN) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { if (std::strcmp(sCode, pPlayer->GetName())!=0) { diff --git a/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp b/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp index 96503aafff8..f6bb60cdbbc 100644 --- a/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp +++ b/src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp @@ -12,9 +12,9 @@ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLIGHT, GOSSIP_SENDER_MAIN, GO return true; } -bool GossipSelect_npc_acherus_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_acherus_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { if (pPlayer->GetPositionZ() >=316) { diff --git a/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp b/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp index eec112ca2e1..d7f27ff4aca 100644 --- a/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp +++ b/src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp @@ -19,15 +19,15 @@ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DOWN, GOSSIP_SENDER_MAIN, GOSS return true; } -bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->GetSession()->SendDoFlight(6376, 881); } - if (action == GOSSIP_ACTION_INFO_DEF + 2) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->GetSession()->SendDoFlight(6376, 882); @@ -48,15 +48,15 @@ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MIDDLE, GOSSIP_SENDER_MAIN, GO -bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 4) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 4) { pPlayer->GetSession()->SendDoFlight(6376, 878); } - if (action == GOSSIP_ACTION_INFO_DEF + 3) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 3) { pPlayer->GetSession()->SendDoFlight(6376, 883); @@ -75,14 +75,14 @@ pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ONEDOWN, GOSSIP_SENDER_MAIN, G return true; } -bool GossipSelect_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 5) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 5) { pPlayer->GetSession()->SendDoFlight(6376, 879); } - if (action == GOSSIP_ACTION_INFO_DEF + 6) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 6) { pPlayer->GetSession()->SendDoFlight(6376, 880); diff --git a/src/bindings/scripts/scripts/custom/test.cpp b/src/bindings/scripts/scripts/custom/test.cpp index 3156bf47911..221411e994b 100644 --- a/src/bindings/scripts/scripts/custom/test.cpp +++ b/src/bindings/scripts/scripts/custom/test.cpp @@ -160,9 +160,9 @@ bool GossipHello_npc_test(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_test(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_test(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); ((npc_escortAI*)(pCreature->AI()))->Start(true, true, pPlayer->GetGUID()); @@ -170,7 +170,7 @@ bool GossipSelect_npc_test(Player* pPlayer, Creature* pCreature, uint32 sender, return true; // prevent Trinity core handling } - if (action == GOSSIP_ACTION_INFO_DEF+2) + if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { pPlayer->CLOSE_GOSSIP_MENU(); ((npc_escortAI*)(pCreature->AI()))->Start(false, false, pPlayer->GetGUID()); @@ -178,7 +178,7 @@ bool GossipSelect_npc_test(Player* pPlayer, Creature* pCreature, uint32 sender, return true; // prevent Trinity core handling } - if (action == GOSSIP_ACTION_INFO_DEF+3) + if (uiAction == GOSSIP_ACTION_INFO_DEF+3) { pPlayer->CLOSE_GOSSIP_MENU(); ((npc_escortAI*)(pCreature->AI()))->Start(false, false, pPlayer->GetGUID()); diff --git a/src/bindings/scripts/scripts/examples/example_creature.cpp b/src/bindings/scripts/scripts/examples/example_creature.cpp index 49a8d6a607c..093c504cb7a 100644 --- a/src/bindings/scripts/scripts/examples/example_creature.cpp +++ b/src/bindings/scripts/scripts/examples/example_creature.cpp @@ -69,7 +69,7 @@ enum struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI { //*** HANDLED FUNCTION *** - //This is the constructor, called only once when the creature is first created + //This is the constructor, called only once when the Creature is first created example_creatureAI(Creature *c) : ScriptedAI(c) {Reset();} //*** CUSTOM VARIABLES **** @@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI }; //This is the GetAI method used by all scripts that involve AI -//It is called every time a new creature using this script is created +//It is called every time a new Creature using this script is created CreatureAI* GetAI_example_creature(Creature* pCreature) { return new example_creatureAI (pCreature); diff --git a/src/bindings/scripts/scripts/examples/example_escort.cpp b/src/bindings/scripts/scripts/examples/example_escort.cpp index 5d897a8183d..fa1a8432837 100644 --- a/src/bindings/scripts/scripts/examples/example_escort.cpp +++ b/src/bindings/scripts/scripts/examples/example_escort.cpp @@ -197,7 +197,7 @@ bool GossipHello_example_escort(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_example_escort(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 uiAction) +bool GossipSelect_example_escort(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { npc_escortAI* pEscortAI = CAST_AI(example_escortAI, pCreature->AI()); diff --git a/src/bindings/scripts/scripts/go/go_scripts.cpp b/src/bindings/scripts/scripts/go/go_scripts.cpp index 53b03164398..d0818fe8dc0 100644 --- a/src/bindings/scripts/scripts/go/go_scripts.cpp +++ b/src/bindings/scripts/scripts/go/go_scripts.cpp @@ -51,7 +51,7 @@ enum SPELL_SUMMON_GHOST_SABER = 5968, }; -bool GOHello_go_cat_figurine(Player* pPlayer, GameObject* _GO) +bool GOHello_go_cat_figurine(Player* pPlayer, GameObject* pGo) { pPlayer->CastSpell(pPlayer,SPELL_SUMMON_GHOST_SABER,true); return false; @@ -61,12 +61,12 @@ bool GOHello_go_cat_figurine(Player* pPlayer, GameObject* _GO) ## go_crystal_pylons (3x) ######*/ -bool GOHello_go_northern_crystal_pylon(Player* pPlayer, GameObject* _GO) +bool GOHello_go_northern_crystal_pylon(Player* pPlayer, GameObject* pGo) { - if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) + if (pGo->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { - pPlayer->PrepareQuestMenu(_GO->GetGUID()); - pPlayer->SendPreparedQuest(_GO->GetGUID()); + pPlayer->PrepareQuestMenu(pGo->GetGUID()); + pPlayer->SendPreparedQuest(pGo->GetGUID()); } if (pPlayer->GetQuestStatus(4285) == QUEST_STATUS_INCOMPLETE) @@ -75,12 +75,12 @@ bool GOHello_go_northern_crystal_pylon(Player* pPlayer, GameObject* _GO) return true; } -bool GOHello_go_eastern_crystal_pylon(Player* pPlayer, GameObject* _GO) +bool GOHello_go_eastern_crystal_pylon(Player* pPlayer, GameObject* pGo) { - if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) + if (pGo->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { - pPlayer->PrepareQuestMenu(_GO->GetGUID()); - pPlayer->SendPreparedQuest(_GO->GetGUID()); + pPlayer->PrepareQuestMenu(pGo->GetGUID()); + pPlayer->SendPreparedQuest(pGo->GetGUID()); } if (pPlayer->GetQuestStatus(4287) == QUEST_STATUS_INCOMPLETE) @@ -89,12 +89,12 @@ bool GOHello_go_eastern_crystal_pylon(Player* pPlayer, GameObject* _GO) return true; } -bool GOHello_go_western_crystal_pylon(Player* pPlayer, GameObject* _GO) +bool GOHello_go_western_crystal_pylon(Player* pPlayer, GameObject* pGo) { - if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) + if (pGo->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { - pPlayer->PrepareQuestMenu(_GO->GetGUID()); - pPlayer->SendPreparedQuest(_GO->GetGUID()); + pPlayer->PrepareQuestMenu(pGo->GetGUID()); + pPlayer->SendPreparedQuest(pGo->GetGUID()); } if (pPlayer->GetQuestStatus(4288) == QUEST_STATUS_INCOMPLETE) @@ -107,7 +107,7 @@ bool GOHello_go_western_crystal_pylon(Player* pPlayer, GameObject* _GO) ## go_barov_journal ######*/ -bool GOHello_go_barov_journal(Player* pPlayer, GameObject* _GO) +bool GOHello_go_barov_journal(Player* pPlayer, GameObject* pGo) { if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086)) { @@ -120,7 +120,7 @@ bool GOHello_go_barov_journal(Player* pPlayer, GameObject* _GO) ## go_field_repair_bot_74A ######*/ -bool GOHello_go_field_repair_bot_74A(Player* pPlayer, GameObject* _GO) +bool GOHello_go_field_repair_bot_74A(Player* pPlayer, GameObject* pGo) { if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704)) { @@ -153,7 +153,7 @@ bool GOHello_go_gilded_brazier(Player* pPlayer, GameObject* pGO) ## go_orb_of_command ######*/ -bool GOHello_go_orb_of_command(Player* pPlayer, GameObject* _GO) +bool GOHello_go_orb_of_command(Player* pPlayer, GameObject* pGo) { if (pPlayer->GetQuestRewardStatus(7761)) pPlayer->CastSpell(pPlayer,23460,true); @@ -165,7 +165,7 @@ bool GOHello_go_orb_of_command(Player* pPlayer, GameObject* _GO) ## go_tablet_of_madness ######*/ -bool GOHello_go_tablet_of_madness(Player* pPlayer, GameObject* _GO) +bool GOHello_go_tablet_of_madness(Player* pPlayer, GameObject* pGo) { if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266)) { @@ -179,9 +179,9 @@ bool GOHello_go_tablet_of_madness(Player* pPlayer, GameObject* _GO) ######*/ //TODO: use gossip option ("Transcript the Tablet") instead, if Trinity adds support. -bool GOHello_go_tablet_of_the_seven(Player* pPlayer, GameObject* _GO) +bool GOHello_go_tablet_of_the_seven(Player* pPlayer, GameObject* pGo) { - if (_GO->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER) + if (pGo->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER) return true; if (pPlayer->GetQuestStatus(4296) == QUEST_STATUS_INCOMPLETE) @@ -194,7 +194,7 @@ bool GOHello_go_tablet_of_the_seven(Player* pPlayer, GameObject* _GO) ## go_jump_a_tron ######*/ -bool GOHello_go_jump_a_tron(Player* pPlayer, GameObject* _GO) +bool GOHello_go_jump_a_tron(Player* pPlayer, GameObject* pGo) { if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) pPlayer->CastSpell(pPlayer,33382,true); @@ -249,7 +249,7 @@ bool GOHello_go_ethereum_prison(Player* pPlayer, GameObject* pGo) if (Spell) pCreature->CastSpell(pPlayer, Spell, false); else - error_log("TSCR: go_ethereum_prison summoned creature (entry %u) but faction (%u) are not expected by script.", pCreature->GetEntry(), pCreature->getFaction()); + error_log("TSCR: go_ethereum_prison summoned Creature (entry %u) but faction (%u) are not expected by script.", pCreature->GetEntry(), pCreature->getFaction()); } } } diff --git a/src/bindings/scripts/scripts/guard/guards.cpp b/src/bindings/scripts/scripts/guard/guards.cpp index 8fd9cdb60fd..fa5592f7c32 100644 --- a/src/bindings/scripts/scripts/guard/guards.cpp +++ b/src/bindings/scripts/scripts/guard/guards.cpp @@ -96,9 +96,9 @@ bool GossipHello_guard_azuremyst(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_POI(-3918.95, -11544.7, 7, 6, 0, "Bank"); @@ -150,9 +150,9 @@ void SendDefaultMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint3 } } -void SendClassTrainerMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(-4274.81, -11495.3, 7, 6, 0, "Shalannius"); @@ -185,9 +185,9 @@ void SendClassTrainerMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, } } -void SendProfTrainerMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-4191.15, -12470, 7, 6, 0, "Daedal"); @@ -247,13 +247,13 @@ void SendProfTrainerMenu_guard_azuremyst(Player* pPlayer, Creature* pCreature, u } } -bool GossipSelect_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_azuremyst(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_azuremyst(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_azuremyst(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_azuremyst(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_azuremyst(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_azuremyst(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_azuremyst(pPlayer, pCreature, uiAction); break; } return true; } @@ -288,9 +288,9 @@ bool GossipHello_guard_bluffwatcher(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_POI(-1257.8, 24.14, 7, 6, 0, "Thunder Bluff Bank"); @@ -357,9 +357,9 @@ void SendDefaultMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, ui } } -void SendBattleMasterMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 action) +void SendBattleMasterMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(-1387.82, -97.55, 7, 6, 0, "Taim Ragetotem"); @@ -376,9 +376,9 @@ void SendBattleMasterMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreatur } } -void SendClassTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(-1054.47, -285, 7, 6, 0, "Hall of Elders"); @@ -407,9 +407,9 @@ void SendClassTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreatur } } -void SendProfTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-1085.56, 27.29, 7, 6, 0, "Bena's Alchemy"); @@ -462,14 +462,14 @@ void SendProfTrainerMenu_guard_bluffwatcher(Player* pPlayer, Creature* pCreature } } -bool GossipSelect_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_bluffwatcher(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_bluffwatcher(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_bluffwatcher(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_bluffwatcher(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_bluffwatcher(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_bluffwatcher(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_bluffwatcher(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_bluffwatcher(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_bluffwatcher(pPlayer, pCreature, uiAction); break; } return true; } @@ -516,9 +516,9 @@ bool GossipHello_guard_darnassus(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Auction house pPlayer->SEND_POI(9861.23, 2334.55, 7, 6, 0, "Darnassus Auction House"); @@ -582,9 +582,9 @@ void SendDefaultMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint3 } } -void SendBattleMasterMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 action) +void SendBattleMasterMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(9923.61, 2327.43, 7, 6, 0, "Brogun Stoneshield"); @@ -601,9 +601,9 @@ void SendBattleMasterMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, } } -void SendClassTrainerMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(10186, 2570.46, 7, 6, 0, "Darnassus Druid Trainer"); @@ -628,9 +628,9 @@ void SendClassTrainerMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, } } -void SendProfTrainerMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(10075.90, 2356.76, 7, 6, 0, "Darnassus Alchemy Trainer"); @@ -675,14 +675,14 @@ void SendProfTrainerMenu_guard_darnassus(Player* pPlayer, Creature* pCreature, u } } -bool GossipSelect_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_darnassus(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_darnassus(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_darnassus(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_darnassus(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_darnassus(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_darnassus(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_darnassus(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_darnassus(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_darnassus(pPlayer, pCreature, uiAction); break; } return true; } @@ -714,9 +714,9 @@ bool GossipHello_guard_dunmorogh(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_GOSSIP_MENU(4288, pCreature->GetGUID()); @@ -764,9 +764,9 @@ void SendDefaultMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint3 } } -void SendClassTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Hunter pPlayer->SEND_POI(-5618.29, -454.25, 7, 6, 0, "Grif Wildheart"); @@ -799,9 +799,9 @@ void SendClassTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, } } -void SendProfTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_GOSSIP_MENU(4301, pCreature->GetGUID()); @@ -851,13 +851,13 @@ void SendProfTrainerMenu_guard_dunmorogh(Player* pPlayer, Creature* pCreature, u } } -bool GossipSelect_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_dunmorogh(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_dunmorogh(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_dunmorogh(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_dunmorogh(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_dunmorogh(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_dunmorogh(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_dunmorogh(pPlayer, pCreature, uiAction); break; } return true; } @@ -887,9 +887,9 @@ bool GossipHello_guard_durotar(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_GOSSIP_MENU(4032, pCreature->GetGUID()); @@ -934,9 +934,9 @@ void SendDefaultMenu_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 } } -void SendClassTrainerMenu_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Hunter pPlayer->SEND_POI(276, -4706.72, 7, 6, 0, "Thotar"); @@ -969,9 +969,9 @@ void SendClassTrainerMenu_guard_durotar(Player* pPlayer, Creature* pCreature, ui } } -void SendProfTrainerMenu_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-800.25, -4894.33, 7, 6, 0, "Miao'zan"); @@ -1019,13 +1019,13 @@ void SendProfTrainerMenu_guard_durotar(Player* pPlayer, Creature* pCreature, uin } } -bool GossipSelect_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_durotar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_durotar(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_durotar(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_durotar(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_durotar(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_durotar(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_durotar(pPlayer, pCreature, uiAction); break; } return true; } @@ -1056,9 +1056,9 @@ bool GossipHello_guard_elwynnforest(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_GOSSIP_MENU(4260, pCreature->GetGUID()); @@ -1106,9 +1106,9 @@ void SendDefaultMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreature, ui } } -void SendClassTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_GOSSIP_MENU(4265, pCreature->GetGUID()); @@ -1143,9 +1143,9 @@ void SendClassTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreatur } } -void SendProfTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-9057.04, 153.63, 7, 6, 0, "Alchemist Mallory"); @@ -1199,13 +1199,13 @@ void SendProfTrainerMenu_guard_elwynnforest(Player* pPlayer, Creature* pCreature } } -bool GossipSelect_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_elwynnforest(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_elwynnforest(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_elwynnforest(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_elwynnforest(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_elwynnforest(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_elwynnforest(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_elwynnforest(pPlayer, pCreature, uiAction); break; } return true; } @@ -1235,9 +1235,9 @@ bool GossipHello_guard_eversong(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Bat Handler pPlayer->SEND_POI(9371.93, -7164.80, 7, 6, 0, "Skymistress Gloaming"); @@ -1283,9 +1283,9 @@ void SendDefaultMenu_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 } } -void SendClassTrainerMenu_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_GOSSIP_MENU(10185, pCreature->GetGUID()); @@ -1317,9 +1317,9 @@ void SendClassTrainerMenu_guard_eversong(Player* pPlayer, Creature* pCreature, u } } -void SendProfTrainerMenu_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(8659.90, -6368.12, 7, 6, 0, "Arcanist Sheynathren"); @@ -1373,13 +1373,13 @@ void SendProfTrainerMenu_guard_eversong(Player* pPlayer, Creature* pCreature, ui } } -bool GossipSelect_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_eversong(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_eversong(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_eversong(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_eversong(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_eversong(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_eversong(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_eversong(pPlayer, pCreature, uiAction); break; } return true; } @@ -1414,9 +1414,9 @@ bool GossipHello_guard_exodar(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Auction house pPlayer->SEND_POI(-4023.6, -11739.3, 7, 6, 0, "Exodar Auction House"); @@ -1488,9 +1488,9 @@ void SendDefaultMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 a } } -void SendBattleMasterMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 action) +void SendBattleMasterMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(-3978.1, -11357, 7, 6, 0, "Alterac Valley Battlemaster"); @@ -1515,9 +1515,9 @@ void SendBattleMasterMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uin } } -void SendClassTrainerMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(-4276.0, -11495, 7, 6, 0, "Exodar Druid Trainer"); @@ -1550,9 +1550,9 @@ void SendClassTrainerMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uin } } -void SendProfTrainerMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-4040.6, -11364.5, 7, 6, 0, "Exodar Alchemy Trainer"); @@ -1613,14 +1613,14 @@ void SendProfTrainerMenu_guard_exodar(Player* pPlayer, Creature* pCreature, uint } } -bool GossipSelect_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_exodar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_exodar(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_exodar(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_exodar(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_exodar(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_exodar(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_exodar(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_exodar(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_exodar(pPlayer, pCreature, uiAction); break; } return true; } @@ -1656,9 +1656,9 @@ bool GossipHello_guard_ironforge(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Auction House pPlayer->SEND_POI(-4957.39, -911.6, 7, 6, 0, "Ironforge Auction House"); @@ -1732,9 +1732,9 @@ void SendDefaultMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint3 } } -void SendBattleMasterMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 action) +void SendBattleMasterMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(-5047.87, -1263.77, 7, 6, 0, "Glordrum Steelbeard"); @@ -1751,9 +1751,9 @@ void SendBattleMasterMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, } } -void SendClassTrainerMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Hunter pPlayer->SEND_POI(-5023, -1253.68, 7, 6, 0, "Hall of Arms"); @@ -1791,9 +1791,9 @@ void SendClassTrainerMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, } } -void SendProfTrainerMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-4858.5, -1241.83, 7, 6, 0, "Berryfizz's Potions and Mixed Drinks"); @@ -1850,14 +1850,14 @@ void SendProfTrainerMenu_guard_ironforge(Player* pPlayer, Creature* pCreature, u } } -bool GossipSelect_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_ironforge(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_ironforge(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_ironforge(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_ironforge(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_ironforge(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_ironforge(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_ironforge(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_ironforge(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_ironforge(pPlayer, pCreature, uiAction); break; } return true; } @@ -1887,9 +1887,9 @@ bool GossipHello_guard_mulgore(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_GOSSIP_MENU(4051, pCreature->GetGUID()); @@ -1930,9 +1930,9 @@ void SendDefaultMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 } } -void SendClassTrainerMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(-2312.15, -443.69, 7, 6, 0, "Gennia Runetotem"); @@ -1953,9 +1953,9 @@ void SendClassTrainerMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, ui } } -void SendProfTrainerMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_GOSSIP_MENU(4058, pCreature->GetGUID()); @@ -2001,13 +2001,13 @@ void SendProfTrainerMenu_guard_mulgore(Player* pPlayer, Creature* pCreature, uin } } -bool GossipSelect_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_mulgore(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_mulgore(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_mulgore(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_mulgore(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_mulgore(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_mulgore(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_mulgore(pPlayer, pCreature, uiAction); break; } return true; } @@ -2045,9 +2045,9 @@ bool GossipHello_guard_orgrimmar(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_POI(1631.51, -4375.33, 7, 6, 0, "Bank of Orgrimmar"); @@ -2125,9 +2125,9 @@ void SendDefaultMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint3 } } -void SendBattleMasterMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 action) +void SendBattleMasterMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(1983.92, -4794.2, 7, 6, 0, "Hall of the Brave"); @@ -2144,9 +2144,9 @@ void SendBattleMasterMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, } } -void SendClassTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Hunter pPlayer->SEND_POI(2114.84, -4625.31, 7, 6, 0, "Orgrimmar Hunter's Hall"); @@ -2183,9 +2183,9 @@ void SendClassTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, } } -void SendProfTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(1955.17, -4475.79, 7, 6, 0, "Yelmak's Alchemy and Potions"); @@ -2242,14 +2242,14 @@ void SendProfTrainerMenu_guard_orgrimmar(Player* pPlayer, Creature* pCreature, u } } -bool GossipSelect_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_orgrimmar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_orgrimmar(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_orgrimmar(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_orgrimmar(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_orgrimmar(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_orgrimmar(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_orgrimmar(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_orgrimmar(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_orgrimmar(pPlayer, pCreature, uiAction); break; } return true; } @@ -2285,9 +2285,9 @@ bool GossipHello_guard_shattrath(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Tavern pPlayer->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern"); @@ -2352,37 +2352,37 @@ void SendDefaultMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint3 } } -void SendBankMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) +void SendBankMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(-1730.5, 5496, 7, 6, 0, "Aldor Bank"); pPlayer->SEND_GOSSIP_MENU(10380, pCreature->GetGUID()); } - if (action == GOSSIP_ACTION_INFO_DEF + 2) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(-1997.7, 5363, 7, 6, 0, "Scyers Bank"); pPlayer->SEND_GOSSIP_MENU(10381, pCreature->GetGUID()); } } -void SendInnMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) +void SendInnMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(-1895, 5767, 7, 6, 0, "Aldor Inn"); pPlayer->SEND_GOSSIP_MENU(10383, pCreature->GetGUID()); } - if (action == GOSSIP_ACTION_INFO_DEF + 2) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(-2178, 5405, 7, 6, 0, "Scyers Inn"); pPlayer->SEND_GOSSIP_MENU(10384, pCreature->GetGUID()); } } -void SendMailboxMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) +void SendMailboxMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->SEND_POI(-1730.5, 5496, 7, 6, 0, "Aldor Bank"); @@ -2403,23 +2403,23 @@ void SendMailboxMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint3 } } -void SendStableMasterMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) +void SendStableMasterMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(-1888.5, 5761, 7, 6, 0, "Aldor Stable"); pPlayer->SEND_GOSSIP_MENU(10321, pCreature->GetGUID()); } - if (action == GOSSIP_ACTION_INFO_DEF + 2) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(-2170, 5404, 7, 6, 0, "Scyers Stable"); pPlayer->SEND_GOSSIP_MENU(10321, pCreature->GetGUID()); } } -void SendBattleMasterMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) +void SendBattleMasterMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->SEND_POI(-1774, 5251, 7, 6, 0, "Alliance Battlemasters"); @@ -2436,9 +2436,9 @@ void SendBattleMasterMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, } } -void SendProfTrainerMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem"); @@ -2475,32 +2475,32 @@ void SendProfTrainerMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, u } } -void SendGemMerchantMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 action) +void SendGemMerchantMenu_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(-1645, 5669.5, 7, 6, 0, "Aldor Gem Merchant"); pPlayer->SEND_GOSSIP_MENU(10698, pCreature->GetGUID()); } - if (action == GOSSIP_ACTION_INFO_DEF + 2) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(-2193, 5424.5, 7, 6, 0, "Scyers Gem Merchant"); pPlayer->SEND_GOSSIP_MENU(10699, pCreature->GetGUID()); } } -bool GossipSelect_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_shattrath(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BANK: SendBankMenu_guard_shattrath(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_INN: SendInnMenu_guard_shattrath(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_STABLEMASTER: SendStableMasterMenu_guard_shattrath(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_GEMMERCHANT: SendGemMerchantMenu_guard_shattrath(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_MAILBOX: SendMailboxMenu_guard_shattrath(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BANK: SendBankMenu_guard_shattrath(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_INN: SendInnMenu_guard_shattrath(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_STABLEMASTER: SendStableMasterMenu_guard_shattrath(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_GEMMERCHANT: SendGemMerchantMenu_guard_shattrath(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_MAILBOX: SendMailboxMenu_guard_shattrath(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, pCreature, uiAction); break; } return true; } @@ -2595,9 +2595,9 @@ bool GossipHello_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Tavern pPlayer->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern"); @@ -2656,9 +2656,9 @@ void SendDefaultMenu_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature, } } -void SendProfTrainerMenu_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem"); @@ -2695,13 +2695,13 @@ void SendProfTrainerMenu_guard_shattrath_aldor(Player* pPlayer, Creature* pCreat } } -bool GossipSelect_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_shattrath_aldor(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath_aldor(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath_aldor(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath_aldor(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath_aldor(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, pCreature, uiAction); break; } return true; } @@ -2791,9 +2791,9 @@ bool GossipHello_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Tavern pPlayer->SEND_POI(-1759.5, 5165, 7, 6, 0, "Worlds End Tavern"); @@ -2851,9 +2851,9 @@ void SendDefaultMenu_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature } } -void SendProfTrainerMenu_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-1648.5, 5534, 7, 6, 0, "Lorokeem"); @@ -2890,13 +2890,13 @@ void SendProfTrainerMenu_guard_shattrath_scryer(Player* pPlayer, Creature* pCrea } } -bool GossipSelect_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_shattrath_scryer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath_scryer(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath_scryer(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_shattrath_scryer(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_shattrath_scryer(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_shattrath(pPlayer, pCreature, uiAction); break; } return true; } @@ -2931,9 +2931,9 @@ bool GossipHello_guard_silvermoon(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Auction house pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TEXT_AH_SILVERMOON_1 , GOSSIP_SENDER_SEC_AUCTIONHOUSE, GOSSIP_ACTION_INFO_DEF + 1); @@ -3007,37 +3007,37 @@ void SendDefaultMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint } } -void SendAuctionhouseMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) +void SendAuctionhouseMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(9644.47, -7140.22, 7, 6, 0, "Western Auction House"); pPlayer->SEND_GOSSIP_MENU(9318, pCreature->GetGUID()); } - if (action == GOSSIP_ACTION_INFO_DEF + 2) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(9683.27, -7521.22, 7, 6, 0, "Royal Exchange Auction House"); pPlayer->SEND_GOSSIP_MENU(9319, pCreature->GetGUID()); } } -void SendInnMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) +void SendInnMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->SEND_POI(9677.7, -7368, 7, 6, 0, "Silvermoon City Inn"); pPlayer->SEND_GOSSIP_MENU(9325, pCreature->GetGUID()); } - if (action == GOSSIP_ACTION_INFO_DEF + 2) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_POI(9561.1, -7517.5, 7, 6, 0, "Wayfarer's Rest tavern"); pPlayer->SEND_GOSSIP_MENU(9603, pCreature->GetGUID()); } } -void SendBattleMasterMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) +void SendBattleMasterMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(9850.49, -7572.26, 7, 6, 0, "Gurak"); @@ -3062,9 +3062,9 @@ void SendBattleMasterMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, } } -void SendClassTrainerMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(9700.55, -7262.57, 7, 6, 0, "Harene Plainwalker"); @@ -3097,9 +3097,9 @@ void SendClassTrainerMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, } } -void SendProfTrainerMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(9998.09, -7214.36, 7, 6, 0, "Silvermoon Alchemy Trainer"); @@ -3160,16 +3160,16 @@ void SendProfTrainerMenu_guard_silvermoon(Player* pPlayer, Creature* pCreature, } } -bool GossipSelect_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_silvermoon(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_silvermoon(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_AUCTIONHOUSE: SendAuctionhouseMenu_guard_silvermoon(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_INN: SendInnMenu_guard_silvermoon(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_silvermoon(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_silvermoon(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_silvermoon(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_silvermoon(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_AUCTIONHOUSE: SendAuctionhouseMenu_guard_silvermoon(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_INN: SendInnMenu_guard_silvermoon(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_silvermoon(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_silvermoon(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_silvermoon(pPlayer, pCreature, uiAction); break; } return true; } @@ -3206,9 +3206,9 @@ bool GossipHello_guard_stormwind(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Auction House pPlayer->SEND_POI(-8811.46, 667.46, 7, 6, 0, "Stormwind Auction House"); @@ -3287,9 +3287,9 @@ void SendDefaultMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint3 } } -void SendBattleMasterMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 action) +void SendBattleMasterMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(-8443.88, 335.99, 7, 6, 0, "Thelman Slatefist"); @@ -3306,9 +3306,9 @@ void SendBattleMasterMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, } } -void SendClassTrainerMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Mage pPlayer->SEND_POI(-9012.0, 867.6, 7, 6, 0, "Wizard`s Sanctum"); @@ -3350,9 +3350,9 @@ void SendClassTrainerMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, } } -void SendProfTrainerMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(-8988.0, 759.60, 7, 6, 0, "Alchemy Needs"); @@ -3409,14 +3409,14 @@ void SendProfTrainerMenu_guard_stormwind(Player* pPlayer, Creature* pCreature, u } } -bool GossipSelect_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_stormwind(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_stormwind(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_stormwind(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_stormwind(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_stormwind(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_stormwind(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_stormwind(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_stormwind(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_stormwind(pPlayer, pCreature, uiAction); break; } return true; } @@ -3447,9 +3447,9 @@ bool GossipHello_guard_teldrassil(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_GOSSIP_MENU(4317, pCreature->GetGUID()); @@ -3492,9 +3492,9 @@ void SendDefaultMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint } } -void SendClassTrainerMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Druid pPlayer->SEND_POI(9741.58, 963.7, 7, 6, 0, "Kal"); @@ -3519,9 +3519,9 @@ void SendClassTrainerMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, } } -void SendProfTrainerMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(9767.59, 878.81, 7, 6, 0, "Cyndra Kindwhisper"); @@ -3563,13 +3563,13 @@ void SendProfTrainerMenu_guard_teldrassil(Player* pPlayer, Creature* pCreature, } } -bool GossipSelect_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_teldrassil(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_teldrassil(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_teldrassil(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_teldrassil(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_teldrassil(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_teldrassil(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_teldrassil(pPlayer, pCreature, uiAction); break; } return true; } @@ -3599,9 +3599,9 @@ bool GossipHello_guard_tirisfal(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_GOSSIP_MENU(4074, pCreature->GetGUID()); @@ -3644,9 +3644,9 @@ void SendDefaultMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 } } -void SendClassTrainerMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Mage pPlayer->SEND_POI(2259.18, 240.93, 7, 6, 0, "Cain Firesong"); @@ -3671,9 +3671,9 @@ void SendClassTrainerMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, u } } -void SendProfTrainerMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(2263.25, 344.23, 7, 6, 0, "Carolai Anise"); @@ -3725,13 +3725,13 @@ void SendProfTrainerMenu_guard_tirisfal(Player* pPlayer, Creature* pCreature, ui } } -bool GossipSelect_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_tirisfal(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_tirisfal(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_tirisfal(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_tirisfal(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_tirisfal(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_tirisfal(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_tirisfal(pPlayer, pCreature, uiAction); break; } return true; } @@ -3767,9 +3767,9 @@ bool GossipHello_guard_undercity(Player* pPlayer, Creature* pCreature) return true; } -void SendDefaultMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Bank pPlayer->SEND_POI(1595.64, 232.45, 7, 6, 0, "Undercity Bank"); @@ -3839,9 +3839,9 @@ void SendDefaultMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint3 } } -void SendBattleMasterMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 action) +void SendBattleMasterMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //AV pPlayer->SEND_POI(1329, 333.92, 7, 6, 0, "Grizzle Halfmane"); @@ -3858,9 +3858,9 @@ void SendBattleMasterMenu_guard_undercity(Player* pPlayer, Creature* pCreature, } } -void SendClassTrainerMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 action) +void SendClassTrainerMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Mage pPlayer->SEND_POI(1781, 53, 7, 6, 0, "Undercity Mage Trainers"); @@ -3885,9 +3885,9 @@ void SendClassTrainerMenu_guard_undercity(Player* pPlayer, Creature* pCreature, } } -void SendProfTrainerMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 action) +void SendProfTrainerMenu_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: //Alchemy pPlayer->SEND_POI(1419.82, 417.19, 7, 6, 0, "The Apothecarium"); @@ -3940,14 +3940,14 @@ void SendProfTrainerMenu_guard_undercity(Player* pPlayer, Creature* pCreature, u } } -bool GossipSelect_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_guard_undercity(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (sender) + switch (uiSender) { - case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_undercity(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_undercity(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_undercity(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_undercity(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendDefaultMenu_guard_undercity(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_CLASSTRAIN: SendClassTrainerMenu_guard_undercity(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_PROFTRAIN: SendProfTrainerMenu_guard_undercity(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_SEC_BATTLEINFO: SendBattleMasterMenu_guard_undercity(pPlayer, pCreature, uiAction); break; } return true; } diff --git a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp b/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp index be884b828d3..8a99ea7fc7a 100644 --- a/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp +++ b/src/bindings/scripts/scripts/npc/npc_innkeeper.cpp @@ -81,9 +81,9 @@ bool GossipHello_npc_innkeeper(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && isEventActive() && !pPlayer->GetAura(SPELL_TRICK_OR_TREATED, pPlayer->GetGUID())) + if (uiAction == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && isEventActive() && !pPlayer->GetAura(SPELL_TRICK_OR_TREATED, pPlayer->GetGUID())) { pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->CastSpell(pPlayer, SPELL_TRICK_OR_TREATED, true); diff --git a/src/bindings/scripts/scripts/npc/npc_professions.cpp b/src/bindings/scripts/scripts/npc/npc_professions.cpp index b1727a2170a..07b40555fd5 100644 --- a/src/bindings/scripts/scripts/npc/npc_professions.cpp +++ b/src/bindings/scripts/scripts/npc/npc_professions.cpp @@ -393,9 +393,9 @@ bool GossipHello_npc_prof_alchemy(Player* pPlayer, Creature* pCreature) return true; } -void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 action) +void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_TRADE: pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -462,25 +462,25 @@ void SendActionMenu_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint3 } } -void SendConfirmLearn_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 action) +void SendConfirmLearn_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action) + if (uiAction) { uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 22427: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 19052: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR, GOSSIP_SENDER_CHECK, action); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 17909: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION, GOSSIP_SENDER_CHECK, action); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION, GOSSIP_SENDER_CHECK, uiAction); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; @@ -488,25 +488,25 @@ void SendConfirmLearn_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uin } } -void SendConfirmUnlearn_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 action) +void SendConfirmUnlearn_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action) + if (uiAction) { uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 22427: //Zarevhi - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 19052: //Lorokeem - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 17909: //Lauranna Thar'well - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; @@ -514,14 +514,14 @@ void SendConfirmUnlearn_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, u } } -bool GossipSelect_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_prof_alchemy(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(sender) + switch(uiSender) { - case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_alchemy(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_alchemy(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_alchemy(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_alchemy(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_alchemy(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_alchemy(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_alchemy(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_alchemy(pPlayer, pCreature, uiAction); break; } return true; } @@ -601,9 +601,9 @@ bool GossipHello_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature) return true; } -void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 action) +void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_TRADE: pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -727,25 +727,25 @@ void SendActionMenu_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, ui } } -void SendConfirmLearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 action) +void SendConfirmLearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action) + if (uiAction) { uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 11191: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, action); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction); //unknown textID (TALK_HAMMER_LEARN) pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 11192: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_CHECK, action); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_CHECK, uiAction); //unknown textID (TALK_AXE_LEARN) pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 11193: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_CHECK, action); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction); //unknown textID (TALK_SWORD_LEARN) pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; @@ -753,9 +753,9 @@ void SendConfirmLearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, } } -void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 action) +void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action) + if (uiAction) { uint32 eCreature = pCreature->GetEntry(); switch(eCreature) @@ -764,23 +764,23 @@ void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature case 11178: //Borgosh Corebender case 5164: //Grumnus Steelshaper case 11177: //Okothos Ironrager - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer),false); //unknown textID (TALK_UNLEARN_AXEORWEAPON) pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 11191: - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID (TALK_HAMMER_UNLEARN) pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 11192: - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID (TALK_AXE_UNLEARN) pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 11193: - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID (TALK_SWORD_UNLEARN) pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; @@ -788,14 +788,14 @@ void SendConfirmUnlearn_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature } } -bool GossipSelect_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_prof_blacksmith(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(sender) + switch(uiSender) { - case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_blacksmith(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_blacksmith(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_blacksmith(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_blacksmith(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_blacksmith(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_blacksmith(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_blacksmith(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_blacksmith(pPlayer, pCreature, uiAction); break; } return true; } @@ -916,15 +916,15 @@ bool GossipHello_npc_engineering_tele_trinket(Player* pPlayer, Creature* pCreatu return true; } -bool GossipSelect_npc_engineering_tele_trinket(Player* pPlayer, Creature* pCreature, uint32 Sender, uint32 Action) +bool GossipSelect_npc_engineering_tele_trinket(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (Action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) pPlayer->CLOSE_GOSSIP_MENU(); - if (Sender != pCreature->GetEntry()) + if (uiSender != pCreature->GetEntry()) return true; - switch(Sender) + switch(uiSender) { case NPC_ZAP: pPlayer->CastSpell(pPlayer, SPELL_LEARN_TO_EVERLOOK, false); @@ -984,9 +984,9 @@ bool GossipHello_npc_prof_leather(Player* pPlayer, Creature* pCreature) return true; } -void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 action) +void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_TRADE: pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -1040,28 +1040,28 @@ void SendActionMenu_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint3 } } -void SendConfirmUnlearn_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 action) +void SendConfirmUnlearn_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action) + if (uiAction) { uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 7866: //Peter Galen case 7867: //Thorkaf Dragoneye - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 7868: //Sarah Tanner case 7869: //Brumn Winterhoof - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 7870: //Caryssia Moonhunter case 7871: //Se'Jib - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; @@ -1069,13 +1069,13 @@ void SendConfirmUnlearn_npc_prof_leather(Player* pPlayer, Creature* pCreature, u } } -bool GossipSelect_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_prof_leather(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(sender) + switch(uiSender) { - case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_leather(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_leather(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_leather(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_leather(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_leather(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_leather(pPlayer, pCreature, uiAction); break; } return true; } @@ -1134,9 +1134,9 @@ bool GossipHello_npc_prof_tailor(Player* pPlayer, Creature* pCreature) return true; } -void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 action) +void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_TRADE: pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -1218,25 +1218,25 @@ void SendActionMenu_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 } } -void SendConfirmLearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 action) +void SendConfirmLearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action) + if (uiAction) { uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 22213: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 22208: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 22212: - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; @@ -1244,25 +1244,25 @@ void SendConfirmLearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint } } -void SendConfirmUnlearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 action) +void SendConfirmUnlearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action) + if (uiAction) { uint32 eCreature = pCreature->GetEntry(); switch(eCreature) { case 22213: //Gidge Spellweaver - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 22208: //Nasmara Moonsong - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; case 22212: //Andrion Darkspinner - pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action,BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); + pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction,BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false); //unknown textID () pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); break; @@ -1270,14 +1270,14 @@ void SendConfirmUnlearn_npc_prof_tailor(Player* pPlayer, Creature* pCreature, ui } } -bool GossipSelect_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(sender) + switch(uiSender) { - case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_tailor(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_tailor(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_tailor(pPlayer, pCreature, action); break; - case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_tailor(pPlayer, pCreature, action); break; + case GOSSIP_SENDER_MAIN: SendActionMenu_npc_prof_tailor(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_LEARN: SendConfirmLearn_npc_prof_tailor(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn_npc_prof_tailor(pPlayer, pCreature, uiAction); break; + case GOSSIP_SENDER_CHECK: SendActionMenu_npc_prof_tailor(pPlayer, pCreature, uiAction); break; } return true; } @@ -1286,11 +1286,11 @@ bool GossipSelect_npc_prof_tailor(Player* pPlayer, Creature* pCreature, uint32 s # start menues for GO (engineering and leatherworking) ###*/ -/*bool GOHello_go_soothsaying_for_dummies(Player* pPlayer, GameObject* _GO) +/*bool GOHello_go_soothsaying_for_dummies(Player* pPlayer, GameObject* pGo) { pPlayer->PlayerTalkClass->GetGossipMenu()->AddMenuItem(0,GOSSIP_LEARN_DRAGON, GOSSIP_SENDER_INFO, GOSSIP_ACTION_INFO_DEF, "", 0); - pPlayer->SEND_GOSSIP_MENU(5584, _GO->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(5584, pGo->GetGUID()); return true; }*/ diff --git a/src/bindings/scripts/scripts/npc/npc_taxi.cpp b/src/bindings/scripts/scripts/npc/npc_taxi.cpp index c6adcb08c5f..161b663fbb1 100644 --- a/src/bindings/scripts/scripts/npc/npc_taxi.cpp +++ b/src/bindings/scripts/scripts/npc/npc_taxi.cpp @@ -81,7 +81,7 @@ bool GossipHello_npc_taxi(Player* pPlayer, Creature* pCreature) break; case 25059: // Isle of Quel'Danas - Ayren Cloudbreaker if (pPlayer->GetQuestStatus(11532) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(11533) == QUEST_STATUS_INCOMPLETE) - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Speaking of action, I've been ordered to undertake an air strike.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Speaking of uiAction, I've been ordered to undertake an air strike.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); if (pPlayer->GetQuestStatus(11542) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(11543) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to intercept the Dawnblade reinforcements.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); @@ -133,9 +133,9 @@ bool GossipHello_npc_taxi(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_taxi(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_taxi(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(action) { + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF: //spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506. pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/npc/npcs_special.cpp index 68c3e0e2559..64f89628528 100644 --- a/src/bindings/scripts/scripts/npc/npcs_special.cpp +++ b/src/bindings/scripts/scripts/npc/npcs_special.cpp @@ -47,7 +47,7 @@ EndContentData */ enum SpawnType { - SPAWNTYPE_TRIPWIRE_ROOFTOP, // no warning, summon creature at smaller range + SPAWNTYPE_TRIPWIRE_ROOFTOP, // no warning, summon Creature at smaller range SPAWNTYPE_ALARMBOT, // cast guards mark and summon npc - if player shows up with that buff duration < 5 seconds attack }; @@ -145,7 +145,7 @@ struct TRINITY_DLL_DECL npc_air_force_botsAI : public ScriptedAI m_uiSpawnedGUID = pSummoned->GetGUID(); else { - error_db_log("TCSR: npc_air_force_bots: wasn't able to spawn creature %u", m_pSpawnAssoc->m_uiSpawnedCreatureEntry); + error_db_log("TCSR: npc_air_force_bots: wasn't able to spawn Creature %u", m_pSpawnAssoc->m_uiSpawnedCreatureEntry); m_pSpawnAssoc = NULL; } @@ -783,10 +783,10 @@ void npc_doctorAI::UpdateAI(const uint32 diff) } } -bool QuestAccept_npc_doctor(Player* pPlayer, Creature *creature, Quest const *quest) +bool QuestAccept_npc_doctor(Player* pPlayer, Creature* pCreature, Quest const *quest) { if ((quest->GetQuestId() == 6624) || (quest->GetQuestId() == 6622)) - CAST_AI(npc_doctorAI, creature->AI())->BeginEvent(pPlayer); + CAST_AI(npc_doctorAI, pCreature->AI())->BeginEvent(pPlayer); return true; } @@ -1167,9 +1167,9 @@ bool GossipHello_npc_mount_vendor(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_TRADE) + if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; @@ -1200,9 +1200,9 @@ bool GossipHello_npc_rogue_trainer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->CLOSE_GOSSIP_MENU(); @@ -1256,9 +1256,9 @@ bool GossipHello_npc_sayge(Player* pPlayer, Creature* pCreature) return true; } -void SendAction_npc_sayge(Player* pPlayer, Creature* pCreature, uint32 action) +void SendAction_npc_sayge(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Slay the Man", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -1302,52 +1302,52 @@ void SendAction_npc_sayge(Player* pPlayer, Creature* pCreature, uint32 action) } } -bool GossipSelect_npc_sayge(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_sayge(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(sender) + switch(uiSender) { case GOSSIP_SENDER_MAIN: - SendAction_npc_sayge(pPlayer, pCreature, action); + SendAction_npc_sayge(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+1: pCreature->CastSpell(pPlayer, SPELL_DMG, false); pPlayer->AddSpellCooldown(SPELL_DMG,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, pCreature, action); + SendAction_npc_sayge(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+2: pCreature->CastSpell(pPlayer, SPELL_RES, false); pPlayer->AddSpellCooldown(SPELL_RES,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, pCreature, action); + SendAction_npc_sayge(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+3: pCreature->CastSpell(pPlayer, SPELL_ARM, false); pPlayer->AddSpellCooldown(SPELL_ARM,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, pCreature, action); + SendAction_npc_sayge(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+4: pCreature->CastSpell(pPlayer, SPELL_SPI, false); pPlayer->AddSpellCooldown(SPELL_SPI,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, pCreature, action); + SendAction_npc_sayge(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+5: pCreature->CastSpell(pPlayer, SPELL_INT, false); pPlayer->AddSpellCooldown(SPELL_INT,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, pCreature, action); + SendAction_npc_sayge(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+6: pCreature->CastSpell(pPlayer, SPELL_STM, false); pPlayer->AddSpellCooldown(SPELL_STM,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, pCreature, action); + SendAction_npc_sayge(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+7: pCreature->CastSpell(pPlayer, SPELL_STR, false); pPlayer->AddSpellCooldown(SPELL_STR,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, pCreature, action); + SendAction_npc_sayge(pPlayer, pCreature, uiAction); break; case GOSSIP_SENDER_MAIN+8: pCreature->CastSpell(pPlayer, SPELL_AGI, false); pPlayer->AddSpellCooldown(SPELL_AGI,0,time(NULL) + 7200); - SendAction_npc_sayge(pPlayer, pCreature, action); + SendAction_npc_sayge(pPlayer, pCreature, uiAction); break; } return true; @@ -1663,7 +1663,7 @@ struct TRINITY_DLL_DECL npc_mirror_image : SpellCasterAI owner->CastSpell(me, 45204, false); } - // Do not reload creature templates on evade mode enter - prevent visual lost + // Do not reload Creature templates on evade mode enter - prevent visual lost void EnterEvadeMode() { if (me->IsInEvadeMode() || !me->isAlive()) diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp index ecc6a1c3c25..db9befd65cf 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp @@ -69,15 +69,15 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 29309: Elder_Nadox = creature->GetGUID(); break; - case 29308: Prince_Taldaram = creature->GetGUID(); break; - case 29310: Jedoga_Shadowseeker = creature->GetGUID(); break; - case 29311: Herald_Volazj = creature->GetGUID(); break; - case 30258: Amanitar = creature->GetGUID(); break; + case 29309: Elder_Nadox = pCreature->GetGUID(); break; + case 29308: Prince_Taldaram = pCreature->GetGUID(); break; + case 29310: Jedoga_Shadowseeker = pCreature->GetGUID(); break; + case 29311: Herald_Volazj = pCreature->GetGUID(); break; + case 30258: Amanitar = pCreature->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp index 1378b79106d..bac772acc6f 100644 --- a/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp +++ b/src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp @@ -62,13 +62,13 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 28684: m_uiKrikthir = creature->GetGUID(); break; - case 28921: m_uiHadronox = creature->GetGUID(); break; - case 29120: m_uiAnubarak = creature->GetGUID(); break; + case 28684: m_uiKrikthir = pCreature->GetGUID(); break; + case 28921: m_uiHadronox = pCreature->GetGUID(); break; + case 29120: m_uiAnubarak = pCreature->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp index 027936c5437..4a3d736d7e7 100644 --- a/src/bindings/scripts/scripts/zone/azshara/azshara.cpp +++ b/src/bindings/scripts/scripts/zone/azshara/azshara.cpp @@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI void UpdateAI(const uint32 diff) { - // we mustn't remove the creature in the same round in which we cast the summon spell, otherwise there will be no summons + // we mustn't remove the Creature in the same round in which we cast the summon spell, otherwise there will be no summons if (spellhit && morphtimer>=5000) { m_creature->ForcedDespawn(); @@ -113,9 +113,9 @@ bool GossipHello_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->CLOSE_GOSSIP_MENU(); @@ -403,9 +403,9 @@ bool GossipHello_mob_rizzle_sprysprocket(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_mob_rizzle_sprysprocket(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_mob_rizzle_sprysprocket(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1 && pPlayer->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1 && pPlayer->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->CastSpell(pPlayer, SPELL_GIVE_SOUTHFURY_MOONSTONE, true); diff --git a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp index 8fc97d40228..75c37fa5689 100644 --- a/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp @@ -267,9 +267,9 @@ bool GossipHello_npc_engineer_spark_overgrind(Player* pPlayer, Creature* pCreatu return true; } -bool GossipSelect_npc_engineer_spark_overgrind(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_engineer_spark_overgrind(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF) + if (uiAction == GOSSIP_ACTION_INFO_DEF) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->setFaction(FACTION_HOSTILE); @@ -580,7 +580,7 @@ bool EffectDummyCreature_npc_nestlewood_owlkin(Unit *pCaster, uint32 spellId, ui pCreatureTarget->UpdateEntry(ENTRY_OWLKIN_INOC); - //set despawn timer, since we want to remove creature after a short time + //set despawn timer, since we want to remove Creature after a short time CAST_AI(npc_nestlewood_owlkinAI, pCreatureTarget->AI())->DespawnTimer = 15000; //always return true when we are handling this spell and effect diff --git a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp index 0d6d176fd41..75208c02837 100644 --- a/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp +++ b/src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp @@ -53,9 +53,9 @@ bool GossipHello_npc_beaten_corpse(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF +1) + if (uiAction == GOSSIP_ACTION_INFO_DEF +1) { pPlayer->SEND_GOSSIP_MENU(3558, pCreature->GetGUID()); pPlayer->TalkedToCreature(pCreature->GetEntry(), pCreature->GetGUID()); @@ -186,9 +186,9 @@ bool GossipHello_npc_sputtervalve(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF) + if (uiAction == GOSSIP_ACTION_INFO_DEF) { pPlayer->SEND_GOSSIP_MENU(2013, pCreature->GetGUID()); pPlayer->AreaExploredOrEventHappens(6981); diff --git a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp b/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp index 9abda926177..7f0f1e570ba 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp @@ -46,9 +46,9 @@ bool GossipHello_npc_spirit_of_olum(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_spirit_of_olum(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_spirit_of_olum(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->InterruptNonMeleeSpells(false); diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp index 7db1094ae4b..2baa0abbe81 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp @@ -243,7 +243,7 @@ struct Yells { uint32 sound; char* text; - uint32 creature, timer, emote; + uint32 pCreature, timer, emote; bool Talk; }; @@ -514,22 +514,22 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI { Timer[EVENT_TALK_SEQUENCE] = Conversation[count].timer; - Creature* creature = NULL; - if (Conversation[count].creature == ILLIDAN_STORMRAGE) - creature = m_creature; - else if (Conversation[count].creature == AKAMA) - creature = (Unit::GetCreature((*m_creature), AkamaGUID)); - else if (Conversation[count].creature == MAIEV_SHADOWSONG) - creature = (Unit::GetCreature((*m_creature), MaievGUID)); + Creature* pCreature = NULL; + if (Conversation[count].pCreature == ILLIDAN_STORMRAGE) + pCreature = m_creature; + else if (Conversation[count].pCreature == AKAMA) + pCreature = (Unit::GetCreature((*m_creature), AkamaGUID)); + else if (Conversation[count].pCreature == MAIEV_SHADOWSONG) + pCreature = (Unit::GetCreature((*m_creature), MaievGUID)); - if (creature) + if (pCreature) { if (Conversation[count].emote) - creature->HandleEmoteCommand(Conversation[count].emote); // Make the creature do some animation! + pCreature->HandleEmoteCommand(Conversation[count].emote); // Make the Creature do some animation! if (Conversation[count].text) - creature->MonsterYell(Conversation[count].text, LANG_UNIVERSAL, 0); // Have the creature yell out some text + pCreature->MonsterYell(Conversation[count].text, LANG_UNIVERSAL, 0); // Have the Creature yell out some text if (Conversation[count].sound) - DoPlaySoundToSet(creature, Conversation[count].sound); // Play some sound on the creature + DoPlaySoundToSet(pCreature, Conversation[count].sound); // Play some sound on the creature } } @@ -1568,9 +1568,9 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI }; -bool GossipSelect_npc_akama_at_illidan(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_akama_at_illidan(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event + if (uiAction == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event { pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(npc_akama_illidanAI, pCreature->AI())->EnterPhase(PHASE_CHANNEL); @@ -1655,7 +1655,7 @@ bool GOHello_cage_trap(Player* pPlayer, GameObject* pGo) float x, y, z; pPlayer->GetPosition(x, y, z); - // Grid search for nearest live creature of entry 23304 within 10 yards + // Grid search for nearest live Creature of entry 23304 within 10 yards if (Creature* pTrigger = pGo->FindNearestCreature(23304, 10.0f)) CAST_AI(cage_trap_triggerAI, pTrigger->AI())->Active = true; pGo->SetGoState(GO_STATE_ACTIVE); diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp index 0f953933213..ea987bf4963 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp @@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL boss_shade_of_akamaAI : public ScriptedAI uint32 ReduceHealthTimer; uint32 SummonTimer; uint32 ResetTimer; - uint32 DefenderTimer; // They are on a flat 15 second timer, independant of the other summon creature timer. + uint32 DefenderTimer; // They are on a flat 15 second timer, independant of the other summon Creature timer. bool IsBanished; bool HasKilledAkama; @@ -820,9 +820,9 @@ CreatureAI* GetAI_npc_akama_shade(Creature* pCreature) return new npc_akamaAI (pCreature); } -bool GossipSelect_npc_akama(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_akama(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) //Fight time { pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(npc_akamaAI, pCreature->AI())->BeginEvent(pPlayer); diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp index a987b63a287..1616333b007 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp @@ -193,14 +193,14 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI } }; -bool GOHello_go_najentus_spine(Player* pPlayer, GameObject* _GO) +bool GOHello_go_najentus_spine(Player* pPlayer, GameObject* pGo) { - if (ScriptedInstance* pInstance = _GO->GetInstanceData()) - if (Creature* Najentus = Unit::GetCreature(*_GO, pInstance->GetData64(DATA_HIGHWARLORDNAJENTUS))) + if (ScriptedInstance* pInstance = pGo->GetInstanceData()) + if (Creature* Najentus = Unit::GetCreature(*pGo, pInstance->GetData64(DATA_HIGHWARLORDNAJENTUS))) if (CAST_AI(boss_najentusAI, Najentus->AI())->RemoveImpalingSpine()) { pPlayer->CastSpell(pPlayer, SPELL_CREATE_NAJENTUS_SPINE, true); - _GO->DeleteObjectWithOwner(); + pGo->DeleteObjectWithOwner(); } return true; } diff --git a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp index bf39aba0f82..6b86140b659 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp @@ -378,8 +378,8 @@ struct TRINITY_DLL_DECL boss_illidari_councilAI : public ScriptedAI return; } DoZoneInCombat(); - // Load GUIDs on first aggro because the creature guids are only set as the creatures are created in world- - // this means that for each creature, it will attempt to LoadGUIDs even though some of the other creatures are + // Load GUIDs on first aggro because the Creature guids are only set as the creatures are created in world- + // this means that for each pCreature, it will attempt to LoadGUIDs even though some of the other creatures are // not in world, and thus have no GUID set in the instance data system. Putting it in aggro ensures that all the creatures // have been loaded and have their GUIDs set in the instance data system. if (!LoadedGUIDs) diff --git a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp b/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp index 62a32c79e1d..173632009ba 100644 --- a/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp +++ b/src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp @@ -128,51 +128,51 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance return NULL; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 22887: Najentus = creature->GetGUID(); break; - case 23089: Akama = creature->GetGUID(); break; - case 22990: Akama_Shade = creature->GetGUID(); break; - case 22841: ShadeOfAkama = creature->GetGUID(); break; - case 22898: Supremus = creature->GetGUID(); break; - case 22917: IllidanStormrage = creature->GetGUID(); break; - case 22949: GathiosTheShatterer = creature->GetGUID(); break; - case 22950: HighNethermancerZerevor = creature->GetGUID(); break; - case 22951: LadyMalande = creature->GetGUID(); break; - case 22952: VerasDarkshadow = creature->GetGUID(); break; - case 23426: IllidariCouncil = creature->GetGUID(); break; - case 23499: BloodElfCouncilVoice = creature->GetGUID(); break; + case 22887: Najentus = pCreature->GetGUID(); break; + case 23089: Akama = pCreature->GetGUID(); break; + case 22990: Akama_Shade = pCreature->GetGUID(); break; + case 22841: ShadeOfAkama = pCreature->GetGUID(); break; + case 22898: Supremus = pCreature->GetGUID(); break; + case 22917: IllidanStormrage = pCreature->GetGUID(); break; + case 22949: GathiosTheShatterer = pCreature->GetGUID(); break; + case 22950: HighNethermancerZerevor = pCreature->GetGUID(); break; + case 22951: LadyMalande = pCreature->GetGUID(); break; + case 22952: VerasDarkshadow = pCreature->GetGUID(); break; + case 23426: IllidariCouncil = pCreature->GetGUID(); break; + case 23499: BloodElfCouncilVoice = pCreature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards) - if (m_auiEncounter[0] == DONE)HandleGameObject(NULL,true,go);break; - case 185882: MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus) - if (m_auiEncounter[1] == DONE)HandleGameObject(NULL,true,go);break; - case 185478: ShadeOfAkamaDoor = go->GetGUID();break; - case 185480: CommonDoor = go->GetGUID(); - if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,go);;break; - case 186153: TeronDoor = go->GetGUID(); - if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,go);;break; - case 185892: GuurtogDoor = go->GetGUID(); - if (m_auiEncounter[4] == DONE)HandleGameObject(NULL,true,go);break; - case 185479: TempleDoor = go->GetGUID(); - if (m_auiEncounter[5] == DONE)HandleGameObject(NULL,true,go);break; - case 185482: MotherDoor = go->GetGUID(); - if (m_auiEncounter[6] == DONE)HandleGameObject(NULL,true,go);break; - case 185481: CouncilDoor = go->GetGUID(); - if (m_auiEncounter[7] == DONE)HandleGameObject(NULL,true,go);break; - case 186152: SimpleDoor = go->GetGUID(); - if (m_auiEncounter[7] == DONE)HandleGameObject(NULL,true,go);break; - case 185905: IllidanGate = go->GetGUID(); break; // Gate leading to Temple Summit - case 186261: IllidanDoor[0] = go->GetGUID(); break; // Right door at Temple Summit - case 186262: IllidanDoor[1] = go->GetGUID(); break; // Left door at Temple Summit + case 185483: NajentusGate = pGo->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards) + if (m_auiEncounter[0] == DONE)HandleGameObject(NULL,true,pGo);break; + case 185882: MainTempleDoors = pGo->GetGUID();// Main Temple Doors - right past Supermoose (Supremus) + if (m_auiEncounter[1] == DONE)HandleGameObject(NULL,true,pGo);break; + case 185478: ShadeOfAkamaDoor = pGo->GetGUID();break; + case 185480: CommonDoor = pGo->GetGUID(); + if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,pGo);;break; + case 186153: TeronDoor = pGo->GetGUID(); + if (m_auiEncounter[3] == DONE)HandleGameObject(NULL,true,pGo);;break; + case 185892: GuurtogDoor = pGo->GetGUID(); + if (m_auiEncounter[4] == DONE)HandleGameObject(NULL,true,pGo);break; + case 185479: TempleDoor = pGo->GetGUID(); + if (m_auiEncounter[5] == DONE)HandleGameObject(NULL,true,pGo);break; + case 185482: MotherDoor = pGo->GetGUID(); + if (m_auiEncounter[6] == DONE)HandleGameObject(NULL,true,pGo);break; + case 185481: CouncilDoor = pGo->GetGUID(); + if (m_auiEncounter[7] == DONE)HandleGameObject(NULL,true,pGo);break; + case 186152: SimpleDoor = pGo->GetGUID(); + if (m_auiEncounter[7] == DONE)HandleGameObject(NULL,true,pGo);break; + case 185905: IllidanGate = pGo->GetGUID(); break; // Gate leading to Temple Summit + case 186261: IllidanDoor[0] = pGo->GetGUID(); break; // Right door at Temple Summit + case 186262: IllidanDoor[1] = pGo->GetGUID(); break; // Left door at Temple Summit } } diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp index 1825c8825b8..17390068f65 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp @@ -436,9 +436,9 @@ bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -519,14 +519,14 @@ bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->CastSpell(pPlayer, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false); } - if (action == GOSSIP_ACTION_TRADE) + if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; @@ -612,9 +612,9 @@ bool GossipHello_npc_dughal_stormwing(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_dughal_stormwing(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_dughal_stormwing(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID()); @@ -768,15 +768,15 @@ CreatureAI* GetAI_npc_marshal_windsor(Creature* pCreature) return marshal_windsorAI; } -bool QuestAccept_npc_marshal_windsor(Player* pPlayer, Creature *creature, Quest const *quest) +bool QuestAccept_npc_marshal_windsor(Player* pPlayer, Creature* pCreature, Quest const *quest) { if (quest->GetQuestId() == 4322) {PlayerStart = player; if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) { - CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS); - creature->setFaction(11); + pCreature->setFaction(11); } } @@ -1077,9 +1077,9 @@ bool GossipHello_npc_tobias_seecher(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_tobias_seecher(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_tobias_seecher(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, true, pPlayer->GetGUID()); @@ -1121,8 +1121,8 @@ struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI void DoGo(uint32 id, uint32 state) { - if (GameObject *go = pInstance->instance->GetGameObject(pInstance->GetData64(id))) - go->SetGoState((GOState)state); + if (GameObject* pGo = pInstance->instance->GetGameObject(pInstance->GetData64(id))) + pGo->SetGoState((GOState)state); } void WaypointReached(uint32 i) diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp index bec4e4a3ec7..d7ee6a6667c 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp @@ -48,9 +48,9 @@ bool GossipHello_boss_gloomrel(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); @@ -207,9 +207,9 @@ bool GossipHello_boss_doomrel(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_boss_doomrel(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_boss_doomrel(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp index 070767be1ab..f8993b36124 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp @@ -142,50 +142,50 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance TombBossGUIDs[i] = 0; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case NPC_EMPEROR: EmperorGUID = creature->GetGUID(); break; - case NPC_PHALANX: PhalanxGUID = creature->GetGUID(); break; - case NPC_DOOMREL: TombBossGUIDs[0] = creature->GetGUID(); break; - case NPC_DOPEREL: TombBossGUIDs[1] = creature->GetGUID(); break; - case NPC_HATEREL: TombBossGUIDs[2] = creature->GetGUID(); break; - case NPC_VILEREL: TombBossGUIDs[3] = creature->GetGUID(); break; - case NPC_SEETHREL: TombBossGUIDs[4] = creature->GetGUID(); break; - case NPC_GLOOMREL: TombBossGUIDs[5] = creature->GetGUID(); break; - case NPC_ANGERREL: TombBossGUIDs[6] = creature->GetGUID(); break; + case NPC_EMPEROR: EmperorGUID = pCreature->GetGUID(); break; + case NPC_PHALANX: PhalanxGUID = pCreature->GetGUID(); break; + case NPC_DOOMREL: TombBossGUIDs[0] = pCreature->GetGUID(); break; + case NPC_DOPEREL: TombBossGUIDs[1] = pCreature->GetGUID(); break; + case NPC_HATEREL: TombBossGUIDs[2] = pCreature->GetGUID(); break; + case NPC_VILEREL: TombBossGUIDs[3] = pCreature->GetGUID(); break; + case NPC_SEETHREL: TombBossGUIDs[4] = pCreature->GetGUID(); break; + case NPC_GLOOMREL: TombBossGUIDs[5] = pCreature->GetGUID(); break; + case NPC_ANGERREL: TombBossGUIDs[6] = pCreature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case GO_ARENA1: GoArena1GUID = go->GetGUID(); break; - case GO_ARENA2: GoArena2GUID = go->GetGUID(); break; - case GO_ARENA3: GoArena3GUID = go->GetGUID(); break; - case GO_ARENA4: GoArena4GUID = go->GetGUID(); break; - case GO_SHADOW_LOCK: GoShadowLockGUID = go->GetGUID(); break; - case GO_SHADOW_MECHANISM: GoShadowMechGUID = go->GetGUID(); break; - case GO_SHADOW_GIANT_DOOR: GoShadowGiantGUID = go->GetGUID(); break; - case GO_SHADOW_DUMMY: GoShadowDummyGUID = go->GetGUID(); break; - case GO_BAR_KEG_SHOT: GoBarKegGUID = go->GetGUID(); break; - case GO_BAR_KEG_TRAP: GoBarKegTrapGUID = go->GetGUID(); break; - case GO_BAR_DOOR: GoBarDoorGUID = go->GetGUID(); break; - case GO_TOMB_ENTER: GoTombEnterGUID = go->GetGUID(); break; + case GO_ARENA1: GoArena1GUID = pGo->GetGUID(); break; + case GO_ARENA2: GoArena2GUID = pGo->GetGUID(); break; + case GO_ARENA3: GoArena3GUID = pGo->GetGUID(); break; + case GO_ARENA4: GoArena4GUID = pGo->GetGUID(); break; + case GO_SHADOW_LOCK: GoShadowLockGUID = pGo->GetGUID(); break; + case GO_SHADOW_MECHANISM: GoShadowMechGUID = pGo->GetGUID(); break; + case GO_SHADOW_GIANT_DOOR: GoShadowGiantGUID = pGo->GetGUID(); break; + case GO_SHADOW_DUMMY: GoShadowDummyGUID = pGo->GetGUID(); break; + case GO_BAR_KEG_SHOT: GoBarKegGUID = pGo->GetGUID(); break; + case GO_BAR_KEG_TRAP: GoBarKegTrapGUID = pGo->GetGUID(); break; + case GO_BAR_DOOR: GoBarDoorGUID = pGo->GetGUID(); break; + case GO_TOMB_ENTER: GoTombEnterGUID = pGo->GetGUID(); break; case GO_TOMB_EXIT: - GoTombExitGUID = go->GetGUID(); + GoTombExitGUID = pGo->GetGUID(); if (GhostKillCount >= 7) - HandleGameObject(0, true, go); + HandleGameObject(0, true, pGo); else - HandleGameObject(0, false, go); + HandleGameObject(0, false, pGo); break; - case GO_LYCEUM: GoLyceumGUID = go->GetGUID(); break; - case GO_GOLEM_ROOM_N: GoGolemNGUID = go->GetGUID(); break; - case GO_GOLEM_ROOM_S: GoGolemSGUID = go->GetGUID(); break; - case GO_THONE_ROOM: GoThoneGUID = go->GetGUID(); break; - case GO_CHEST_SEVEN: GoChestGUID = go->GetGUID(); break; + case GO_LYCEUM: GoLyceumGUID = pGo->GetGUID(); break; + case GO_GOLEM_ROOM_N: GoGolemNGUID = pGo->GetGUID(); break; + case GO_GOLEM_ROOM_S: GoGolemSGUID = pGo->GetGUID(); break; + case GO_THONE_ROOM: GoThoneGUID = pGo->GetGUID(); break; + case GO_CHEST_SEVEN: GoChestGUID = pGo->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp index 2df0f38bca5..39fbd1f4be9 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp @@ -215,19 +215,19 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI } }; -void SendDefaultMenu_boss_vael(Player* pPlayer, Creature* pCreature, uint32 action) +void SendDefaultMenu_boss_vael(Player* pPlayer, Creature* pCreature, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) //Fight time { pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(boss_vaelAI, pCreature->AI())->BeginSpeach(pPlayer); } } -bool GossipSelect_boss_vael(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_boss_vael(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (sender == GOSSIP_SENDER_MAIN) - SendDefaultMenu_boss_vael(pPlayer, pCreature, action); + if (uiSender == GOSSIP_SENDER_MAIN) + SendDefaultMenu_boss_vael(pPlayer, pCreature, uiAction); return true; } diff --git a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp index 1dd78d2e518..78ed29fc27e 100644 --- a/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp +++ b/src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp @@ -263,7 +263,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI SpawnedAdds++; - //Spawn creature and force it to start attacking a random target + //Spawn Creature and force it to start attacking a random target Spawned = m_creature->SummonCreature(CreatureID,ADD_X1,ADD_Y1,ADD_Z1,5.000,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); target = SelectUnit(SELECT_TARGET_RANDOM,0); if (target && Spawned) @@ -357,9 +357,9 @@ bool GossipHello_boss_victor_nefarius(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_boss_victor_nefarius(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_boss_victor_nefarius(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); diff --git a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp index cc3613eefec..fcb6f4af497 100644 --- a/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp @@ -45,7 +45,7 @@ bool obelisk_one, obelisk_two, obelisk_three, obelisk_four, obelisk_five; ## mobs_bladespire_ogre ######*/ -//TODO: add support for quest 10512 + creature abilities +//TODO: add support for quest 10512 + Creature abilities struct TRINITY_DLL_DECL mobs_bladespire_ogreAI : public ScriptedAI { mobs_bladespire_ogreAI(Creature *c) : ScriptedAI(c) {} @@ -123,7 +123,7 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI ScriptedAI::MoveInLineOfSight(who); } - //in case creature was not summoned (not expected) + //in case Creature was not summoned (not expected) void MovementInform(uint32 type, uint32 id) { if (type != POINT_MOTION_TYPE) @@ -291,9 +291,9 @@ bool GossipHello_npc_overseer_nuaar(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->SEND_GOSSIP_MENU(10533, pCreature->GetGUID()); pPlayer->AreaExploredOrEventHappens(10682); @@ -315,9 +315,9 @@ bool GossipHello_npc_saikkal_the_elder(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_saikkal_the_elder(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_saikkal_the_elder(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes elder. Tell me more of the book.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -335,11 +335,11 @@ bool GossipSelect_npc_saikkal_the_elder(Player* pPlayer, Creature* pCreature, ui ## go_legion_obelisk ######*/ -bool GOHello_go_legion_obelisk(Player* pPlayer, GameObject* _GO) +bool GOHello_go_legion_obelisk(Player* pPlayer, GameObject* pGo) { if (pPlayer->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE) { - switch(_GO->GetEntry()) + switch(pGo->GetEntry()) { case LEGION_OBELISK_ONE: obelisk_one = true; @@ -360,7 +360,7 @@ bool GOHello_go_legion_obelisk(Player* pPlayer, GameObject* _GO) if (obelisk_one == true && obelisk_two == true && obelisk_three == true && obelisk_four == true && obelisk_five == true) { - _GO->SummonCreature(19963,2943.40f,4778.20f,284.49f,0.94f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000); + pGo->SummonCreature(19963,2943.40f,4778.20f,284.49f,0.94f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000); //reset global var obelisk_one = false; obelisk_two = false; diff --git a/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp b/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp index ae53e1995d4..37c04639278 100644 --- a/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp +++ b/src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp @@ -48,9 +48,9 @@ bool GossipHello_npc_deathly_usher(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF) + if (uiAction == GOSSIP_ACTION_INFO_DEF) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->CastSpell(pPlayer, SPELL_TELEPORT_SINGLE, true); @@ -92,9 +92,9 @@ bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_fallen_hero_of_horde(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); diff --git a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp index 24442be131f..f033cba93b8 100644 --- a/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp +++ b/src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp @@ -92,9 +92,9 @@ bool GossipHello_npc_captured_sunhawk_agent(Player* pPlayer, Creature* pCreature return true; } -bool GossipSelect_npc_captured_sunhawk_agent(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_captured_sunhawk_agent(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); diff --git a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp index 2a98be637bf..2d6aa006a90 100644 --- a/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp +++ b/src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp @@ -84,9 +84,9 @@ bool GossipHello_npc_ragged_john(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_ragged_john(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_ragged_john(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp index 759ce912da2..b57abc8c5d6 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp @@ -310,7 +310,7 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI mRiftWaveCount = 0; entry = PortalWaves[mWaveId].PortalMob[mRiftWaveCount]; - debug_log("TSCR: npc_time_rift: summoning wave creature (Wave %u, Entry %u).",mRiftWaveCount,entry); + debug_log("TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).",mRiftWaveCount,entry); ++mRiftWaveCount; @@ -376,9 +376,9 @@ bool GossipHello_npc_saat(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_saat(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_saat(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp index 78a5cbbf1de..f406bca7113 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp @@ -118,10 +118,10 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance pPlayer->SendUpdateWorldState(WORLD_STATE_BM,0); } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - if (creature->GetEntry() == C_MEDIVH) - MedivhGUID = creature->GetGUID(); + if (pCreature->GetEntry() == C_MEDIVH) + MedivhGUID = pCreature->GetGUID(); } //what other conditions to check? diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp index 4cb7c34fea1..9f2971083e4 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_anetheron.cpp @@ -41,7 +41,7 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI boss_anetheronAI(Creature *c) : hyjal_trashAI(c) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; SpellEntry *TempSpell = GET_SPELL(SPELL_SLEEP); if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 1) @@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI uint32 SleepTimer; uint32 AuraTimer; uint32 InfernoTimer; - bool go; + bool pGo; uint32 pos; void Reset() @@ -123,9 +123,9 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI { //Must update npc_escortAI npc_escortAI::UpdateAI(diff); - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { AddWaypoint(0, 4896.08, -1576.35, 1333.65); @@ -148,8 +148,7 @@ struct TRINITY_DLL_DECL boss_anetheronAI : public hyjal_trashAI if (SwarmTimer < diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true); - if (target) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,100,true)) DoCast(target,SPELL_CARRION_SWARM); SwarmTimer = 45000+rand()%15000; diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp index 87b4d64e3a6..4819a74fc0c 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp @@ -479,7 +479,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public hyjal_trashAI if (CheckDistanceTimer < diff) { - // To simplify the check, we simply summon a creature in the location and then check how far we are from the creature + // To simplify the check, we simply summon a Creature in the location and then check how far we are from the creature Creature* Check = m_creature->SummonCreature(CREATURE_CHANNEL_TARGET, NORDRASSIL_X, NORDRASSIL_Y, NORDRASSIL_Z, 0, TEMPSUMMON_TIMED_DESPAWN, 2000); if (Check) { diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp index 994d0693e7e..c4c928359c1 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_azgalor.cpp @@ -32,7 +32,7 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI boss_azgalorAI(Creature *c) : hyjal_trashAI(c) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; SpellEntry *TempSpell = GET_SPELL(SPELL_HOWL_OF_AZGALOR); if (TempSpell) @@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI uint32 EnrageTimer; bool enraged; - bool go; + bool pGo; uint32 pos; void Reset() @@ -115,9 +115,9 @@ struct TRINITY_DLL_DECL boss_azgalorAI : public hyjal_trashAI { //Must update npc_escortAI npc_escortAI::UpdateAI(diff); - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { AddWaypoint(0, 5492.91, -2404.61, 1462.63); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp index cd877031f33..59700ddac0a 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_kazrogal.cpp @@ -29,7 +29,7 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI boss_kazrogalAI(Creature *c) : hyjal_trashAI(c) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; SpellEntry *TempSpell = GET_SPELL(SPELL_MARK); if (TempSpell && TempSpell->EffectImplicitTargetA[0] != 1) @@ -43,7 +43,7 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI uint32 WarStompTimer; uint32 MarkTimer; uint32 MarkTimerBase; - bool go; + bool pGo; uint32 pos; void Reset() @@ -110,9 +110,9 @@ struct TRINITY_DLL_DECL boss_kazrogalAI : public hyjal_trashAI { //Must update npc_escortAI npc_escortAI::UpdateAI(diff); - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { AddWaypoint(0, 5492.91, -2404.61, 1462.63); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp index aa1cac6c76a..a7a9adf1676 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_rage_winterchill.cpp @@ -35,7 +35,7 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI boss_rage_winterchillAI(Creature *c) : hyjal_trashAI(c) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; } @@ -43,7 +43,7 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI uint32 DecayTimer; uint32 NovaTimer; uint32 IceboltTimer; - bool go; + bool pGo; uint32 pos; void Reset() @@ -107,9 +107,9 @@ struct TRINITY_DLL_DECL boss_rage_winterchillAI : public hyjal_trashAI { //Must update npc_escortAI npc_escortAI::UpdateAI(diff); - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { AddWaypoint(0, 4896.08, -1576.35, 1333.65); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp index 335d7019de0..a7861e11ccc 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp @@ -86,10 +86,10 @@ bool GossipHello_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: ai->StartEvent(pPlayer); @@ -155,11 +155,11 @@ bool GossipHello_npc_thrall(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_thrall(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_thrall(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { hyjalAI* ai = CAST_AI(hyjalAI, pCreature->AI()); ai->DeSpawnVeins();//despawn the alliance veins - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: ai->StartEvent(pPlayer); @@ -200,9 +200,9 @@ bool GossipHello_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF) + if (uiAction == GOSSIP_ACTION_INFO_DEF) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_TEAR_OF_GODDESS, 1); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp index 4683acbc8dc..726ce62b4c9 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp @@ -356,7 +356,7 @@ void hyjalAI::Reset() WaveCount = 0; EnemyCount = 0; - // Set faction properly based on creature entry + // Set faction properly based on Creature entry switch(m_creature->GetEntry()) { case JAINA: @@ -513,7 +513,7 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) if (pInstance->GetData(DATA_RAIDDAMAGE) < MINRAIDDAMAGE) pCreature->SetDisableReputationGain(true);//no repu for solo farming } - // Check if creature is a boss. + // Check if Creature is a boss. if (pCreature->isWorldBoss()) { if (!FirstBossDead) BossGUID[0] = pCreature->GetGUID(); diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp index dbcd1064fa6..b0739530fdc 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp @@ -382,7 +382,7 @@ struct mob_giant_infernalAI : public hyjal_trashAI m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->SetDisplayId(MODEL_INVIS); - go = false; + pGo = false; pos = 0; Reset(); } @@ -390,7 +390,7 @@ struct mob_giant_infernalAI : public hyjal_trashAI bool meteor; bool CanMove; bool WpEnabled; - bool go; + bool pGo; uint32 pos; uint32 spawnTimer; uint32 FlameBuffetTimer; @@ -468,9 +468,9 @@ struct mob_giant_infernalAI : public hyjal_trashAI npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { AddWaypoint(0, HordeWPs[7][0]+irand(-3,3), HordeWPs[7][1]+irand(-3,3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall @@ -510,12 +510,12 @@ struct mob_abominationAI : public hyjal_trashAI mob_abominationAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; Reset(); } - bool go; + bool pGo; uint32 KnockDownTimer; uint32 pos; void Reset() @@ -558,9 +558,9 @@ struct mob_abominationAI : public hyjal_trashAI npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs @@ -605,12 +605,12 @@ struct mob_ghoulAI : public hyjal_trashAI mob_ghoulAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; Reset(); } - bool go; + bool pGo; uint32 FrenzyTimer; uint32 pos; uint32 MoveTimer; @@ -659,9 +659,9 @@ struct mob_ghoulAI : public hyjal_trashAI npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs @@ -708,12 +708,12 @@ struct mob_necromancerAI : public hyjal_trashAI mob_necromancerAI(Creature* c) : hyjal_trashAI(c), summons(m_creature) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; Reset(); } SummonList summons; - bool go; + bool pGo; uint32 ShadowBoltTimer; uint32 pos; void Reset() @@ -778,9 +778,9 @@ struct mob_necromancerAI : public hyjal_trashAI npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs @@ -826,12 +826,12 @@ struct mob_bansheeAI : public hyjal_trashAI mob_bansheeAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; Reset(); } - bool go; + bool pGo; uint32 CourseTimer; uint32 WailTimer; uint32 ShellTimer; @@ -870,9 +870,9 @@ struct mob_bansheeAI : public hyjal_trashAI npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs @@ -925,12 +925,12 @@ struct mob_crypt_fiendAI : public hyjal_trashAI mob_crypt_fiendAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; Reset(); } - bool go; + bool pGo; uint32 WebTimer; uint32 pos; void Reset() @@ -965,9 +965,9 @@ struct mob_crypt_fiendAI : public hyjal_trashAI npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs @@ -1011,12 +1011,12 @@ struct mob_fel_stalkerAI : public hyjal_trashAI mob_fel_stalkerAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; Reset(); } - bool go; + bool pGo; uint32 ManaBurnTimer; uint32 pos; void Reset() @@ -1051,9 +1051,9 @@ struct mob_fel_stalkerAI : public hyjal_trashAI npc_escortAI::UpdateAI(diff); if (IsEvent) { - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs @@ -1097,12 +1097,12 @@ struct mob_frost_wyrmAI : public hyjal_trashAI mob_frost_wyrmAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; Reset(); } - bool go; + bool pGo; uint32 FrostBreathTimer; uint32 pos; uint32 MoveTimer; @@ -1152,9 +1152,9 @@ struct mob_frost_wyrmAI : public hyjal_trashAI } if (IsEvent) { - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { if (!useFlyPath) @@ -1208,13 +1208,13 @@ struct mob_gargoyleAI : public hyjal_trashAI mob_gargoyleAI(Creature* c) : hyjal_trashAI(c) { pInstance = c->GetInstanceData(); - go = false; + pGo = false; pos = 0; DummyTarget[0] = 0;DummyTarget[1] = 0;DummyTarget[2] = 0; Reset(); } - bool go; + bool pGo; uint32 StrikeTimer; uint32 pos; uint32 MoveTimer; @@ -1264,9 +1264,9 @@ struct mob_gargoyleAI : public hyjal_trashAI } if (IsEvent) { - if (!go) + if (!pGo) { - go = true; + pGo = true; if (pInstance) { if (!useFlyPath) diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp index c55a02c50a9..83fbbc67b73 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp @@ -101,42 +101,42 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance return false; } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { case 182060: - HordeGate = go->GetGUID(); + HordeGate = pGo->GetGUID(); if (allianceRetreat) - HandleGameObject(0, true, go); + HandleGameObject(0, true, pGo); else - HandleGameObject(0, false, go); + HandleGameObject(0, false, pGo); break; case 182061: - ElfGate = go->GetGUID(); + ElfGate = pGo->GetGUID(); if (hordeRetreat) - HandleGameObject(0, true, go); + HandleGameObject(0, true, pGo); else - HandleGameObject(0, false, go); + HandleGameObject(0, false, pGo); break; case GO_ANCIENT_GEM: - m_uiAncientGemGUID.push_back(go->GetGUID()); + m_uiAncientGemGUID.push_back(pGo->GetGUID()); break; } } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 17767: RageWinterchill = creature->GetGUID(); break; - case 17808: Anetheron = creature->GetGUID(); break; - case 17888: Kazrogal = creature->GetGUID(); break; - case 17842: Azgalor = creature->GetGUID(); break; - case 17968: Archimonde = creature->GetGUID(); break; - case 17772: JainaProudmoore = creature->GetGUID(); break; - case 17852: Thrall = creature->GetGUID(); break; - case 17948: TyrandeWhisperwind = creature->GetGUID(); break; + case 17767: RageWinterchill = pCreature->GetGUID(); break; + case 17808: Anetheron = pCreature->GetGUID(); break; + case 17888: Kazrogal = pCreature->GetGUID(); break; + case 17842: Azgalor = pCreature->GetGUID(); break; + case 17968: Archimonde = pCreature->GetGUID(); break; + case 17772: JainaProudmoore = pCreature->GetGUID(); break; + case 17852: Thrall = pCreature->GetGUID(); break; + case 17948: TyrandeWhisperwind = pCreature->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp index 86a0628520c..b8ec8f2e111 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp @@ -89,18 +89,18 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance } } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { case THRALL_ENTRY: - ThrallGUID = creature->GetGUID(); + ThrallGUID = pCreature->GetGUID(); break; case TARETHA_ENTRY: - TarethaGUID = creature->GetGUID(); + TarethaGUID = pCreature->GetGUID(); break; case EPOCH_ENTRY: - EpochGUID = creature->GetGUID(); + EpochGUID = pCreature->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp index 77ac61ba7cf..71309b41825 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp @@ -58,9 +58,9 @@ bool GossipHello_npc_erozion(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_ENTRY_BOMBS, 1); @@ -70,7 +70,7 @@ bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 sende } pPlayer->SEND_GOSSIP_MENU(9515, pCreature->GetGUID()); } - if (action == GOSSIP_ACTION_INFO_DEF+2) + if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { pPlayer->CLOSE_GOSSIP_MENU(); } @@ -133,7 +133,7 @@ bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 sende #define THRALL_MODEL_UNEQUIPPED 17292 #define THRALL_MODEL_EQUIPPED 18165 -//Misc creature entries +//Misc Creature entries #define ENTRY_ARMORER 18764 #define ENTRY_SCARLOC 17862 @@ -339,7 +339,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI CAST_AI(npc_escortAI, (Taretha->AI()))->Start(false, true, PlayerGUID); } - //kill credit creature for quest + //kill credit Creature for quest Map* pMap = m_creature->GetMap(); Map::PlayerList const& players = pMap->GetPlayers(); if (!players.isEmpty() && pMap->IsDungeon()) @@ -522,10 +522,10 @@ bool GossipHello_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { ScriptedInstance* pInstance = (pCreature->GetInstanceData()); - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->CLOSE_GOSSIP_MENU(); @@ -629,15 +629,15 @@ bool GossipHello_npc_taretha(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_taretha(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_taretha(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { ScriptedInstance* pInstance = (pCreature->GetInstanceData()); - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, pCreature->GetGUID()); } - if (action == GOSSIP_ACTION_INFO_DEF+2) + if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp index 44b38373bfb..f1bc6ce0cf1 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp @@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI pInstance = c->GetInstanceData(); Intro = false; JustCreated = true; - m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //set it only once on creature create (no need do intro if wiped) + m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //set it only once on Creature create (no need do intro if wiped) } ScriptedInstance *pInstance; diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp index 4c4fa0663e5..e43afc2926f 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp @@ -39,7 +39,7 @@ EndScriptData */ #define SPELL_EARTHSHOCK 39076 #define SPELL_MINDBLAST 37531 -// --- Spells used by Inner Demons and creature ID +// --- Spells used by Inner Demons and Creature ID #define INNER_DEMON_ID 21857 #define AURA_DEMONIC_ALIGNMENT 37713 #define SPELL_SHADOWBOLT 39309 diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp index 229dadaa25f..ebeda6aa565 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp @@ -35,9 +35,9 @@ EndScriptData */ 5 - Lady Vashj Event */ -bool GOHello_go_bridge_console(Player* pPlayer, GameObject* go) +bool GOHello_go_bridge_console(Player* pPlayer, GameObject* pGo) { - ScriptedInstance* pInstance = go->GetInstanceData(); + ScriptedInstance* pInstance = pGo->GetInstanceData(); if (!pInstance) return false; @@ -103,47 +103,47 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance return false; } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { case 184568: - ControlConsole = go->GetGUID(); - go->setActive(true); + ControlConsole = pGo->GetGUID(); + pGo->setActive(true); break; case 184203: - BridgePart[0] = go->GetGUID(); - go->setActive(true); + BridgePart[0] = pGo->GetGUID(); + pGo->setActive(true); break; case 184204: - BridgePart[1] = go->GetGUID(); - go->setActive(true); + BridgePart[1] = pGo->GetGUID(); + pGo->setActive(true); break; case 184205: - BridgePart[2] = go->GetGUID(); - go->setActive(true); + BridgePart[2] = pGo->GetGUID(); + pGo->setActive(true); break; case 184956: - StrangePool = go->GetGUID(); - if (go->isActiveObject()) + StrangePool = pGo->GetGUID(); + if (pGo->isActiveObject()) SetData(DATA_STRANGE_POOL, DONE); } } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 21212: LadyVashj = creature->GetGUID(); break; - case 21214: Karathress = creature->GetGUID(); break; - case 21966: Sharkkis = creature->GetGUID(); break; - case 21217: LurkerBelow = creature->GetGUID(); break; - case 21965: Tidalvess = creature->GetGUID(); break; - case 21964: Caribdis = creature->GetGUID(); break; - case 21215: LeotherasTheBlind = creature->GetGUID(); break;} + case 21212: LadyVashj = pCreature->GetGUID(); break; + case 21214: Karathress = pCreature->GetGUID(); break; + case 21966: Sharkkis = pCreature->GetGUID(); break; + case 21217: LurkerBelow = pCreature->GetGUID(); break; + case 21965: Tidalvess = pCreature->GetGUID(); break; + case 21964: Caribdis = pCreature->GetGUID(); break; + case 21215: LeotherasTheBlind = pCreature->GetGUID(); break;} } void SetData64(uint32 type, uint64 data) diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp index 63c5314c23f..29616a123ad 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp @@ -36,17 +36,17 @@ EndScriptData */ 3 - Warlord Kalithresh Event */ -bool GOHello_go_main_chambers_access_panel(Player* pPlayer, GameObject* _GO) +bool GOHello_go_main_chambers_access_panel(Player* pPlayer, GameObject* pGo) { - ScriptedInstance* pInstance = _GO->GetInstanceData(); + ScriptedInstance* pInstance = pGo->GetInstanceData(); if (!pInstance) return false; - if (_GO->GetEntry() == ACCESS_PANEL_HYDRO && (pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == DONE || pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)) + if (pGo->GetEntry() == ACCESS_PANEL_HYDRO && (pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == DONE || pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL)) pInstance->SetData(TYPE_HYDROMANCER_THESPIA,SPECIAL); - if (_GO->GetEntry() == ACCESS_PANEL_MEK && (pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == DONE || pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)) + if (pGo->GetEntry() == ACCESS_PANEL_MEK && (pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == DONE || pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL)) pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER,SPECIAL); return true; @@ -87,23 +87,23 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance return false; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 17797: ThespiaGUID = creature->GetGUID(); break; - case 17796: MekgineerGUID = creature->GetGUID(); break; - case 17798: KalithreshGUID = creature->GetGUID(); break; + case 17797: ThespiaGUID = pCreature->GetGUID(); break; + case 17796: MekgineerGUID = pCreature->GetGUID(); break; + case 17798: KalithreshGUID = pCreature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case MAIN_CHAMBERS_DOOR: MainChambersDoor = go->GetGUID(); break; - case ACCESS_PANEL_HYDRO: AccessPanelHydro = go->GetGUID(); break; - case ACCESS_PANEL_MEK: AccessPanelMek = go->GetGUID(); break; + case MAIN_CHAMBERS_DOOR: MainChambersDoor = pGo->GetGUID(); break; + case ACCESS_PANEL_HYDRO: AccessPanelHydro = pGo->GetGUID(); break; + case ACCESS_PANEL_MEK: AccessPanelMek = pGo->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp b/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp index 3b7b33ca2f3..4d968e58011 100644 --- a/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp +++ b/src/bindings/scripts/scripts/zone/darkshore/darkshore.cpp @@ -315,9 +315,9 @@ bool GossipHello_npc_threshwackonator(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_threshwackonator(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_threshwackonator(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { CAST_AI(npc_threshwackonatorAI, pCreature->AI())->DoStart(pPlayer->GetGUID()); pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp b/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp index 8f5cf62c927..b631c3b13e7 100644 --- a/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp +++ b/src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp @@ -118,10 +118,10 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance MoveCreatureInside(DefiasCompanion); } - void MoveCreatureInside(Creature *creature) + void MoveCreatureInside(Creature* pCreature) { - creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); - creature->GetMotionMaster()->MovePoint(0, -102.7,-655.9, creature->GetPositionZ()); + pCreature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); + pCreature->GetMotionMaster()->MovePoint(0, -102.7,-655.9, pCreature->GetPositionZ()); } void ShootCannon() @@ -141,18 +141,18 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance DoorLever->SetUInt32Value(GAMEOBJECT_FLAGS, 4); } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { case GO_IRONCLAD_DOOR: - IronCladDoor = go; + IronCladDoor = pGo; break; case GO_DEFIAS_CANNON: - DefiasCannon = go; + DefiasCannon = pGo; break; case GO_DOOR_LEVER: - DoorLever = go; + DoorLever = pGo; break; } } diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp index c728ebd15e9..9999f80dc85 100644 --- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp @@ -70,9 +70,9 @@ bool GossipHello_npc_augustus_the_touched(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_augustus_the_touched(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_augustus_the_touched(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_TRADE) + if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } @@ -126,9 +126,9 @@ bool GossipHello_npc_tirion_fordring(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_tirion_fordring(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_tirion_fordring(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thank you, Tirion. What of your identity?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); diff --git a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp index b70af3c94a1..db227f669a9 100644 --- a/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp +++ b/src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp @@ -934,9 +934,9 @@ CreatureAI* GetAI_npc_unworthy_initiate_anchor(Creature* pCreature) return new npc_unworthy_initiate_anchorAI(pCreature); } -bool GOHello_go_acherus_soul_prison(Player* pPlayer, GameObject* go) +bool GOHello_go_acherus_soul_prison(Player* pPlayer, GameObject* pGo) { - if (Creature *anchor = go->FindNearestCreature(29521, 15)) + if (Creature *anchor = pGo->FindNearestCreature(29521, 15)) if (uint64 prisonerGUID = anchor->AI()->GetGUID()) if (Creature* prisoner = Creature::GetCreature(*pPlayer, prisonerGUID)) CAST_AI(npc_unworthy_initiateAI, (prisoner->AI()))->EventStart(anchor, pPlayer); diff --git a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp index 9782c030f0c..9a0952eb4fb 100644 --- a/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp +++ b/src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp @@ -101,9 +101,9 @@ bool GossipHello_npc_prospector_anvilward(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_prospector_anvilward(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_prospector_anvilward(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -415,11 +415,11 @@ bool GossipHello_master_kelerun_bloodmourn(Player* pPlayer, Creature* pCreature) return true; } -bool QuestAccept_master_kelerun_bloodmourn(Player* pPlayer, Creature *creature, Quest const *quest) +bool QuestAccept_master_kelerun_bloodmourn(Player* pPlayer, Creature* pCreature, Quest const *quest) { // One Player exclusive quest, wait for user go activation if (quest->GetQuestId() == QUEST_SECOND_TRIAL) - CAST_AI(master_kelerun_bloodmournAI, creature->AI())->questPhase = 1; + CAST_AI(master_kelerun_bloodmournAI, pCreature->AI())->questPhase = 1; return true; } @@ -578,12 +578,12 @@ struct TRINITY_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI } }; -bool QuestAccept_npc_apprentice_mirveda(Player* pPlayer, Creature* creature, Quest const* quest) +bool QuestAccept_npc_apprentice_mirveda(Player* pPlayer, Creature* pCreature, Quest const* quest) { if (quest->GetQuestId() == QUEST_UNEXPECTED_RESULT) { - CAST_AI(npc_apprentice_mirvedaAI, creature->AI())->Summon = true; - CAST_AI(npc_apprentice_mirvedaAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(npc_apprentice_mirvedaAI, pCreature->AI())->Summon = true; + CAST_AI(npc_apprentice_mirvedaAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); } return true; } diff --git a/src/bindings/scripts/scripts/zone/felwood/felwood.cpp b/src/bindings/scripts/scripts/zone/felwood/felwood.cpp index ed7ae74957e..29c25afd821 100644 --- a/src/bindings/scripts/scripts/zone/felwood/felwood.cpp +++ b/src/bindings/scripts/scripts/zone/felwood/felwood.cpp @@ -67,9 +67,9 @@ bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCrea return true; } -bool GossipSelect_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action==GOSSIP_ACTION_INFO_DEF+1) + if (uiAction ==GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->CastSpell(pPlayer, 15120, false); diff --git a/src/bindings/scripts/scripts/zone/feralas/feralas.cpp b/src/bindings/scripts/scripts/zone/feralas/feralas.cpp index f0320a5e443..83c9516d738 100644 --- a/src/bindings/scripts/scripts/zone/feralas/feralas.cpp +++ b/src/bindings/scripts/scripts/zone/feralas/feralas.cpp @@ -42,14 +42,14 @@ bool GossipHello_npc_gregan_brewspewer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_gregan_brewspewer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_gregan_brewspewer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); pPlayer->SEND_GOSSIP_MENU(2434, pCreature->GetGUID()); } - if (action == GOSSIP_ACTION_TRADE) + if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } diff --git a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp index 94c45af786a..be04a56c23a 100644 --- a/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp +++ b/src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp @@ -47,9 +47,9 @@ bool GossipHello_npc_blood_knight_dawnstar(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_blood_knight_dawnstar(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_blood_knight_dawnstar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24226, 1, false); @@ -80,9 +80,9 @@ bool GossipHello_npc_budd_nedreck(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_budd_nedreck(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_budd_nedreck(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF) + if (uiAction == GOSSIP_ACTION_INFO_DEF) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->CastSpell(pPlayer, 42540, false); @@ -109,9 +109,9 @@ bool GossipHello_npc_rathis_tomber(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_rathis_tomber(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_rathis_tomber(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_TRADE) + if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; } @@ -120,7 +120,7 @@ bool GossipSelect_npc_rathis_tomber(Player* pPlayer, Creature* pCreature, uint32 ## go_gilded_brazier (Paladin First Trail quest (9678)) #####*/ -bool GOHello_gilded_brazier(Player* pPlayer, GameObject* _GO) +bool GOHello_gilded_brazier(Player* pPlayer, GameObject* pGo) { if (pPlayer->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE) { diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp index cf0c0372c66..0ac5cbcaf7a 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp @@ -70,27 +70,27 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance return false; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 18835: KigglerTheCrazed = creature->GetGUID(); break; - case 18836: BlindeyeTheSeer = creature->GetGUID(); break; - case 18834: OlmTheSummoner = creature->GetGUID(); break; - case 18832: KroshFirehand = creature->GetGUID(); break; - case 18831: Maulgar = creature->GetGUID(); break; + case 18835: KigglerTheCrazed = pCreature->GetGUID(); break; + case 18836: BlindeyeTheSeer = pCreature->GetGUID(); break; + case 18834: OlmTheSummoner = pCreature->GetGUID(); break; + case 18832: KroshFirehand = pCreature->GetGUID(); break; + case 18831: Maulgar = pCreature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { case 184468: - MaulgarDoor = go->GetGUID(); - if (m_auiEncounter[0] == DONE) HandleGameObject(NULL, true, go); + MaulgarDoor = pGo->GetGUID(); + if (m_auiEncounter[0] == DONE) HandleGameObject(NULL, true, pGo); break; - case 184662: GruulDoor = go->GetGUID(); break; + case 184662: GruulDoor = pGo->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp index d6068809c05..5a18ded0c08 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp @@ -81,53 +81,53 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { if (!add) return; - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 17381: The_MakerGUID = creature->GetGUID(); break; - case 17380: BroggokGUID = creature->GetGUID(); break; - case 17377: Kelidan_The_BreakerGUID = creature->GetGUID(); break; + case 17381: The_MakerGUID = pCreature->GetGUID(); break; + case 17380: BroggokGUID = pCreature->GetGUID(); break; + case 17377: Kelidan_The_BreakerGUID = pCreature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { if (!add) return; - if (go->GetEntry() == 181766) //Final exit door - Door1GUID = go->GetGUID(); - if (go->GetEntry() == 181811) //The Maker Front door - Door2GUID = go->GetGUID(); - if (go->GetEntry() == 181812) //The Maker Rear door - Door3GUID = go->GetGUID(); - if (go->GetEntry() == 181822) //Broggok Front door - Door4GUID = go->GetGUID(); - if (go->GetEntry() == 181819) //Broggok Rear door - Door5GUID = go->GetGUID(); - if (go->GetEntry() == 181823) //Kelidan exit door - Door6GUID = go->GetGUID(); - - if (go->GetEntry() == 181813) //The Maker prison cell front right - PrisonCell1GUID = go->GetGUID(); - if (go->GetEntry() == 181814) //The Maker prison cell back right - PrisonCell2GUID = go->GetGUID(); - if (go->GetEntry() == 181816) //The Maker prison cell front left - PrisonCell3GUID = go->GetGUID(); - if (go->GetEntry() == 181815) //The Maker prison cell back left - PrisonCell4GUID = go->GetGUID(); - if (go->GetEntry() == 181821) //Broggok prison cell front right - PrisonCell5GUID = go->GetGUID(); - if (go->GetEntry() == 181818) //Broggok prison cell back right - PrisonCell6GUID = go->GetGUID(); - if (go->GetEntry() == 181820) //Broggok prison cell front left - PrisonCell7GUID = go->GetGUID(); - if (go->GetEntry() == 181817) //Broggok prison cell back left - PrisonCell8GUID = go->GetGUID(); + if (pGo->GetEntry() == 181766) //Final exit door + Door1GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181811) //The Maker Front door + Door2GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181812) //The Maker Rear door + Door3GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181822) //Broggok Front door + Door4GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181819) //Broggok Rear door + Door5GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181823) //Kelidan exit door + Door6GUID = pGo->GetGUID(); + + if (pGo->GetEntry() == 181813) //The Maker prison cell front right + PrisonCell1GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181814) //The Maker prison cell back right + PrisonCell2GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181816) //The Maker prison cell front left + PrisonCell3GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181815) //The Maker prison cell back left + PrisonCell4GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181821) //Broggok prison cell front right + PrisonCell5GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181818) //Broggok prison cell back right + PrisonCell6GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181820) //Broggok prison cell front left + PrisonCell7GUID = pGo->GetGUID(); + if (pGo->GetEntry() == 181817) //Broggok prison cell back left + PrisonCell8GUID = pGo->GetGUID(); } uint64 GetData64(uint32 data) diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp index 99b2af0c08a..5942f0142ef 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp @@ -40,12 +40,12 @@ struct TRINITY_DLL_DECL instance_ramparts : public ScriptedInstance m_uiChestHGUID = 0; } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case 185168: m_uiChestNGUID = go->GetGUID(); break; - case 185169: m_uiChestHGUID = go->GetGUID(); break; + case 185168: m_uiChestNGUID = pGo->GetGUID(); break; + case 185169: m_uiChestHGUID = pGo->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp index 2ac2999e315..8f7c076a701 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp @@ -501,12 +501,12 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI }; //Manticron Cube -bool GOHello_go_Manticron_Cube(Player* pPlayer, GameObject* _GO) +bool GOHello_go_Manticron_Cube(Player* pPlayer, GameObject* pGo) { - ScriptedInstance* pInstance =_GO->GetInstanceData(); + ScriptedInstance* pInstance = pGo->GetInstanceData(); if (!pInstance) return true; if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS) return true; - Creature *Magtheridon =Unit::GetCreature(*_GO, pInstance->GetData64(DATA_MAGTHERIDON)); + Creature *Magtheridon =Unit::GetCreature(*pGo, pInstance->GetData64(DATA_MAGTHERIDON)); if (!Magtheridon || !Magtheridon->isAlive()) return true; // if exhausted or already channeling return @@ -516,7 +516,7 @@ bool GOHello_go_Manticron_Cube(Player* pPlayer, GameObject* _GO) pPlayer->InterruptNonMeleeSpells(false); pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP, true); pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP_VISUAL, false); - CAST_AI(boss_magtheridonAI, Magtheridon->AI())->SetClicker(_GO->GetGUID(), pPlayer->GetGUID()); + CAST_AI(boss_magtheridonAI, Magtheridon->AI())->SetClicker(pGo->GetGUID(), pPlayer->GetGUID()); return true; } diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp index 2228e5c2bfb..eb8e9b1a961 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp @@ -70,28 +70,28 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance return false; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { case 17257: - MagtheridonGUID = creature->GetGUID(); + MagtheridonGUID = pCreature->GetGUID(); break; case 17256: - ChannelerGUID.insert(creature->GetGUID()); + ChannelerGUID.insert(pCreature->GetGUID()); break; } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { case 181713: - go->SetUInt32Value(GAMEOBJECT_FLAGS, 0); + pGo->SetUInt32Value(GAMEOBJECT_FLAGS, 0); break; case 183847: - DoorGUID = go->GetGUID(); + DoorGUID = pGo->GetGUID(); break; case 184653: // hall case 184634: // six columns @@ -100,7 +100,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance case 184637: case 184638: case 184639: - ColumnGUID.insert(go->GetGUID()); + ColumnGUID.insert(pGo->GetGUID()); break; } } diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp index acf90450a0d..721d1efd03c 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_nethekurse.cpp @@ -364,7 +364,7 @@ struct TRINITY_DLL_DECL mob_fel_orc_convertAI : public ScriptedAI } }; -//NOTE: this creature are also summoned by other spells, for different creatures +//NOTE: this Creature are also summoned by other spells, for different creatures struct TRINITY_DLL_DECL mob_lesser_shadow_fissureAI : public ScriptedAI { mob_lesser_shadow_fissureAI(Creature *c) : ScriptedAI(c) {} diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp index 2dc337f0d97..864a49a84ba 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp @@ -44,19 +44,19 @@ struct TRINITY_DLL_DECL instance_shattered_halls : public ScriptedInstance nethekurseDoorGUID = 0; } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case DOOR_NETHEKURSE: nethekurseDoorGUID = go->GetGUID(); break; + case DOOR_NETHEKURSE: nethekurseDoorGUID = pGo->GetGUID(); break; } } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 16807: nethekurseGUID = creature->GetGUID(); break; + case 16807: nethekurseGUID = pCreature->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp index ec2f1c91f13..a8a8463889f 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp @@ -120,9 +120,9 @@ CreatureAI* GetAI_npc_aeranas(Creature* pCreature) ## go_haaleshi_altar ######*/ -bool GOHello_go_haaleshi_altar(Player* pPlayer, GameObject* _GO) +bool GOHello_go_haaleshi_altar(Player* pPlayer, GameObject* pGo) { - _GO->SummonCreature(C_AERANAS,-1321.79, 4043.80, 116.24, 1.25, TEMPSUMMON_TIMED_DESPAWN, 180000); + pGo->SummonCreature(C_AERANAS,-1321.79, 4043.80, 116.24, 1.25, TEMPSUMMON_TIMED_DESPAWN, 180000); return false; } diff --git a/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp b/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp index 550db276d7d..3903562f23c 100644 --- a/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp +++ b/src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp @@ -53,9 +53,9 @@ bool GossipHello_npc_royal_historian_archesonus(Player* pPlayer, Creature* pCrea return true; } -bool GossipSelect_npc_royal_historian_archesonus(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_royal_historian_archesonus(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp index 2684f5cce20..53b1c2d11b2 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/boss_midnight.cpp @@ -41,7 +41,7 @@ EndScriptData */ #define MOUNTED_DISPLAYID 16040 -//Attumen (TODO: Use the summoning spell instead of creature id. It works , but is not convenient for us) +//Attumen (TODO: Use the summoning spell instead of Creature id. It works , but is not convenient for us) #define SUMMON_ATTUMEN 15550 struct TRINITY_DLL_DECL boss_midnightAI : public ScriptedAI diff --git a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp index fde2b83b84d..da6f77e7c20 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp @@ -727,9 +727,9 @@ bool GossipHello_npc_grandmother(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_grandmother(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_grandmother(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF) + if (uiAction == GOSSIP_ACTION_INFO_DEF) { if (Creature* pBigBadWolf = pCreature->SummonCreature(CREATURE_BIG_BAD_WOLF, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, HOUR*2*IN_MILISECONDS)) pBigBadWolf->AI()->AttackStart(pPlayer); diff --git a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp index eacff4958e2..2ee3f3958cf 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp @@ -104,13 +104,13 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance return false; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch (creature->GetEntry()) + switch (pCreature->GetEntry()) { - case 17229: m_uiKilrekGUID = creature->GetGUID(); break; - case 15688: m_uiTerestianGUID = creature->GetGUID(); break; - case 15687: m_uiMoroesGUID = creature->GetGUID(); break; + case 17229: m_uiKilrekGUID = pCreature->GetGUID(); break; + case 15688: m_uiTerestianGUID = pCreature->GetGUID(); break; + case 15687: m_uiMoroesGUID = pCreature->GetGUID(); break; } } @@ -174,36 +174,36 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case 183932: m_uiCurtainGUID = go->GetGUID(); break; + case 183932: m_uiCurtainGUID = pGo->GetGUID(); break; case 184278: - m_uiStageDoorLeftGUID = go->GetGUID(); + m_uiStageDoorLeftGUID = pGo->GetGUID(); if (m_auiEncounter[4] == DONE) - go->SetGoState(GO_STATE_ACTIVE); + pGo->SetGoState(GO_STATE_ACTIVE); break; case 184279: - m_uiStageDoorRightGUID = go->GetGUID(); + m_uiStageDoorRightGUID = pGo->GetGUID(); if (m_auiEncounter[4] == DONE) - go->SetGoState(GO_STATE_ACTIVE); + pGo->SetGoState(GO_STATE_ACTIVE); break; - case 184517: m_uiLibraryDoor = go->GetGUID(); break; - case 185521: m_uiMassiveDoor = go->GetGUID(); break; - case 184276: m_uiGamesmansDoor = go->GetGUID(); break; - case 184277: m_uiGamesmansExitDoor = go->GetGUID(); break; - case 185134: m_uiNetherspaceDoor = go->GetGUID(); break; - case 184274: MastersTerraceDoor[0] = go->GetGUID(); break; - case 184280: MastersTerraceDoor[1] = go->GetGUID(); break; + case 184517: m_uiLibraryDoor = pGo->GetGUID(); break; + case 185521: m_uiMassiveDoor = pGo->GetGUID(); break; + case 184276: m_uiGamesmansDoor = pGo->GetGUID(); break; + case 184277: m_uiGamesmansExitDoor = pGo->GetGUID(); break; + case 185134: m_uiNetherspaceDoor = pGo->GetGUID(); break; + case 184274: MastersTerraceDoor[0] = pGo->GetGUID(); break; + case 184280: MastersTerraceDoor[1] = pGo->GetGUID(); break; case 184275: - m_uiSideEntranceDoor = go->GetGUID(); + m_uiSideEntranceDoor = pGo->GetGUID(); if (m_auiEncounter[4] == DONE) - go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); + pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); else - go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); + pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_LOCKED); break; - case 185119: DustCoveredChest = go->GetGUID(); break; + case 185119: DustCoveredChest = pGo->GetGUID(); break; } switch(m_uiOperaEvent) diff --git a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp index a859516e8dc..9f6983251c5 100644 --- a/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp +++ b/src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp @@ -359,11 +359,11 @@ bool GossipHello_npc_barnes(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_barnes(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_barnes(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { npc_barnesAI* pBarnesAI = CAST_AI(npc_barnesAI, pCreature->AI()); - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -417,9 +417,9 @@ bool GossipHello_npc_berthold(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_berthold(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_berthold(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CastSpell(pPlayer, SPELL_TELEPORT, true); pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp b/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp index bf2d013bc8d..21a65af5319 100644 --- a/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp +++ b/src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp @@ -53,9 +53,9 @@ bool GossipHello_npc_mountaineer_pebblebitty(Player* pPlayer, Creature* pCreatur return true; } -bool GossipSelect_npc_mountaineer_pebblebitty(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_mountaineer_pebblebitty(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp index f2bb352ac60..e0123a5367b 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_priestess_delrissa.cpp @@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI void InitializeLackeys() { - //can be called if creature are dead, so avoid + //can be called if Creature are dead, so avoid if (!m_creature->isAlive()) return; @@ -165,7 +165,7 @@ struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI //pre-allocate size for speed LackeyEntryList.resize((sizeof(m_auiAddEntries) / sizeof(uint32))); - //fill vector array with entries from creature array + //fill vector array with entries from Creature array for(uint8 i = 0; i < LackeyEntryList.size(); ++i) LackeyEntryList[i] = m_auiAddEntries[i]; diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp index 3f152593948..161852ed99d 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp @@ -333,7 +333,7 @@ struct TRINITY_DLL_DECL mob_fel_crystalAI : public ScriptedAI { if (CAST_AI(boss_selin_fireheartAI, Selin->AI())->CrystalGUID == m_creature->GetGUID()) { - // Set this to false if we are the creature that Selin is draining so his AI flows properly + // Set this to false if we are the Creature that Selin is draining so his AI flows properly CAST_AI(boss_selin_fireheartAI, Selin->AI())->DrainingCrystal = false; CAST_AI(boss_selin_fireheartAI, Selin->AI())->IsDraining = false; CAST_AI(boss_selin_fireheartAI, Selin->AI())->EmpowerTimer = 10000; diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp index 9cf9eebeb48..4b7a68b9a61 100644 --- a/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp +++ b/src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp @@ -125,29 +125,29 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance } } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 24723: SelinGUID = creature->GetGUID(); break; - case 24560: DelrissaGUID = creature->GetGUID(); break; - case 24722: FelCrystals.push_back(creature->GetGUID()); break; + case 24723: SelinGUID = pCreature->GetGUID(); break; + case 24560: DelrissaGUID = pCreature->GetGUID(); break; + case 24722: FelCrystals.push_back(pCreature->GetGUID()); break; } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case 187896: VexallusDoorGUID = go->GetGUID(); break; + case 187896: VexallusDoorGUID = pGo->GetGUID(); break; //SunwellRaid Gate 02 - case 187979: SelinDoorGUID = go->GetGUID(); break; + case 187979: SelinDoorGUID = pGo->GetGUID(); break; //Assembly Chamber Door - case 188065: SelinEncounterDoorGUID = go->GetGUID(); break; - case 187770: DelrissaDoorGUID = go->GetGUID(); break; - case 188064: KaelDoorGUID = go->GetGUID(); break; - case 188165: KaelStatue[0] = go->GetGUID(); break; - case 188166: KaelStatue[1] = go->GetGUID(); break; + case 188065: SelinEncounterDoorGUID = pGo->GetGUID(); break; + case 187770: DelrissaDoorGUID = pGo->GetGUID(); break; + case 188064: KaelDoorGUID = pGo->GetGUID(); break; + case 188165: KaelStatue[0] = pGo->GetGUID(); break; + case 188166: KaelStatue[1] = pGo->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp b/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp index 90845d0ea0b..0cb6150b1aa 100644 --- a/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp +++ b/src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp @@ -94,84 +94,84 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance }; - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { case 176951: //Sulfuron - RuneKoro = go->GetGUID(); + RuneKoro = pGo->GetGUID(); break; case 176952: //Geddon - RuneZeth = go->GetGUID(); + RuneZeth = pGo->GetGUID(); break; case 176953: //Shazzrah - RuneMazj = go->GetGUID(); + RuneMazj = pGo->GetGUID(); break; case 176954: //Golemagg - RuneTheri = go->GetGUID(); + RuneTheri = pGo->GetGUID(); break; case 176955: //Garr - RuneBlaz = go->GetGUID(); + RuneBlaz = pGo->GetGUID(); break; case 176956: //Magmadar - RuneKress = go->GetGUID(); + RuneKress = pGo->GetGUID(); break; case 176957: //Gehennas - RuneMohn = go->GetGUID(); + RuneMohn = pGo->GetGUID(); break; case 179703: - m_uiFirelordCacheGUID = go->GetGUID(); //when majordomo event == DONE DoRespawnGameObject(m_uiFirelordCacheGUID,); + m_uiFirelordCacheGUID = pGo->GetGUID(); //when majordomo event == DONE DoRespawnGameObject(m_uiFirelordCacheGUID,); break; } } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch (creature->GetEntry()) + switch (pCreature->GetEntry()) { case ID_LUCIFRON: - Lucifron = creature->GetGUID(); + Lucifron = pCreature->GetGUID(); break; case ID_MAGMADAR: - Magmadar = creature->GetGUID(); + Magmadar = pCreature->GetGUID(); break; case ID_GEHENNAS: - Gehennas = creature->GetGUID(); + Gehennas = pCreature->GetGUID(); break; case ID_GARR: - Garr = creature->GetGUID(); + Garr = pCreature->GetGUID(); break; case ID_GEDDON: - Geddon = creature->GetGUID(); + Geddon = pCreature->GetGUID(); break; case ID_SHAZZRAH: - Shazzrah = creature->GetGUID(); + Shazzrah = pCreature->GetGUID(); break; case ID_SULFURON: - Sulfuron = creature->GetGUID(); + Sulfuron = pCreature->GetGUID(); break; case ID_GOLEMAGG: - Golemagg = creature->GetGUID(); + Golemagg = pCreature->GetGUID(); break; case ID_DOMO: - Domo = creature->GetGUID(); + Domo = pCreature->GetGUID(); break; case ID_RAGNAROS: - Ragnaros = creature->GetGUID(); + Ragnaros = pCreature->GetGUID(); break; case ID_FLAMEWAKERPRIEST: - FlamewakerPriest = creature->GetGUID(); + FlamewakerPriest = pCreature->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp index 82fa0ad1531..b31047cccd2 100644 --- a/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp +++ b/src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp @@ -70,9 +70,9 @@ bool GossipHello_npc_bunthen_plainswind(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_bunthen_plainswind(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_bunthen_plainswind(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->CLOSE_GOSSIP_MENU(); @@ -112,9 +112,9 @@ bool GossipHello_npc_great_bear_spirit(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_great_bear_spirit(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_great_bear_spirit(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -169,9 +169,9 @@ bool GossipHello_npc_silva_filnaveth(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_silva_filnaveth(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_silva_filnaveth(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->CLOSE_GOSSIP_MENU(); @@ -520,11 +520,11 @@ CreatureAI* GetAI_npc_clintar_spirit(Creature* pCreature) #define CLINTAR_SPIRIT 22916 -bool QuestAccept_npc_clintar_dreamwalker(Player* pPlayer, Creature *creature, Quest const *quest) +bool QuestAccept_npc_clintar_dreamwalker(Player* pPlayer, Creature* pCreature, Quest const *quest) { if (quest->GetQuestId() == 10965) { - Creature *clintar_spirit = creature->SummonCreature(CLINTAR_SPIRIT, CLINTAR_SPIRIT_SUMMON_X, CLINTAR_SPIRIT_SUMMON_Y, CLINTAR_SPIRIT_SUMMON_Z, CLINTAR_SPIRIT_SUMMON_O, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000); + Creature *clintar_spirit = pCreature->SummonCreature(CLINTAR_SPIRIT, CLINTAR_SPIRIT_SUMMON_X, CLINTAR_SPIRIT_SUMMON_Y, CLINTAR_SPIRIT_SUMMON_Z, CLINTAR_SPIRIT_SUMMON_O, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000); if (clintar_spirit) CAST_AI(npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(pPlayer); } diff --git a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp index 6326ef733e0..b1e17fc8ea5 100644 --- a/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp +++ b/src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp @@ -49,9 +49,9 @@ bool GossipHello_npc_skorn_whitecloud(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_skorn_whitecloud(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_skorn_whitecloud(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF) + if (uiAction == GOSSIP_ACTION_INFO_DEF) pPlayer->SEND_GOSSIP_MENU(523, pCreature->GetGUID()); return true; diff --git a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp index afb6657a7f5..09435b91efe 100644 --- a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp +++ b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp @@ -203,9 +203,9 @@ bool GossipHello_mob_lump(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_mob_lump(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_mob_lump(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -294,9 +294,9 @@ bool GossipHello_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+10: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); @@ -339,7 +339,7 @@ bool GossipSelect_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature, return true; } -bool QuestAccept_npc_altruis_the_sufferer(Player* pPlayer, Creature *creature, Quest const *quest) +bool QuestAccept_npc_altruis_the_sufferer(Player* pPlayer, Creature* pCreature, Quest const *quest) { if (!pPlayer->GetQuestRewardStatus(9991)) //Survey the Land, q-id 9991 { @@ -391,9 +391,9 @@ bool GossipHello_npc_greatmother_geyah(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_greatmother_geyah(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_greatmother_geyah(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); @@ -478,9 +478,9 @@ bool GossipHello_npc_lantresor_of_the_blade(Player* pPlayer, Creature* pCreature return true; } -bool GossipSelect_npc_lantresor_of_the_blade(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_lantresor_of_the_blade(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp index cb97097ad4c..a93ff572ab0 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_kelthuzad.cpp @@ -196,7 +196,7 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public BossAI { Phase = 3 ; DoScriptText(SAY_REQUEST_AID, m_creature); - //here Lich King should respond to KelThuzad but I don't know which creature to make talk + //here Lich King should respond to KelThuzad but I don't know which Creature to make talk //so for now just make Kelthuzad says it. DoScriptText(SAY_ANSWER_REQUEST, m_creature); } diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp index ad175323bf1..f0dd9e735cb 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp @@ -160,8 +160,8 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI { if (Player* pPlayer = Unit::GetPlayer(itr->first)) pPlayer->RemoveAura(SPELL_ICEBOLT); - if (GameObject *go = GameObject::GetGameObject(*me, itr->second)) - go->DeleteObjectWithOwner(); + if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second)) + pGo->DeleteObjectWithOwner(); } iceblocks.clear(); } @@ -311,10 +311,10 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI for(IceBlockMap::iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr) { - if (GameObject *go = GameObject::GetGameObject(*me, itr->second)) + if (GameObject* pGo = GameObject::GetGameObject(*me, itr->second)) { - if (go->IsInBetween(me, target, 2.0f) - && me->GetExactDistance2d(target->GetPositionX(), target->GetPositionY()) - me->GetExactDistance2d(go->GetPositionX(), go->GetPositionY()) < 5.0f) + if (pGo->IsInBetween(me, target, 2.0f) + && me->GetExactDistance2d(target->GetPositionX(), target->GetPositionY()) - me->GetExactDistance2d(pGo->GetPositionX(), pGo->GetPositionY()) < 5.0f) { target->ApplySpellImmune(0, IMMUNITY_ID, SPELL_FROST_EXPLOSION, true); targets.push_back(target); diff --git a/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp b/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp index 53f02af4d65..f6121c18ef5 100644 --- a/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp +++ b/src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp @@ -98,7 +98,7 @@ inline uint32 GetEruptionSection(float x, float y) struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData { instance_naxxramas(Map* pMap) : InstanceData(pMap) - , Sapphiron(NULL), GothikGate(NULL), HorsemenChest(NULL), HorsemenNum(0) + , Sapphiron(NULL), pGothikGate(NULL), HorsemenChest(NULL), HorsemenNum(0) { SetBossNumber(MAX_BOSS_NUMBER); LoadDoorData(doorData); @@ -106,40 +106,40 @@ struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData } std::set HeiganEruption[4]; - GameObject *GothikGate, *HorsemenChest; - Creature *Sapphiron; + GameObject* pGothikGate, *HorsemenChest; + Creature* Sapphiron; uint32 HorsemenNum; - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 15989: Sapphiron = add ? creature : NULL; return; + case 15989: Sapphiron = add ? pCreature : NULL; return; } - AddMinion(creature, add); + AddMinion(pCreature, add); } - void OnGameObjectCreate(GameObject* go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - if (go->GetGOInfo()->displayId == 6785 || go->GetGOInfo()->displayId == 1287) + if (pGo->GetGOInfo()->displayId == 6785 || pGo->GetGOInfo()->displayId == 1287) { - uint32 section = GetEruptionSection(go->GetPositionX(), go->GetPositionY()); + uint32 section = GetEruptionSection(pGo->GetPositionX(), pGo->GetPositionY()); if (add) - HeiganEruption[section].insert(go); + HeiganEruption[section].insert(pGo); else - HeiganEruption[section].erase(go); + HeiganEruption[section].erase(pGo); return; } - switch(go->GetEntry()) + switch(pGo->GetEntry()) { case GO_BIRTH: if (!add && Sapphiron) Sapphiron->AI()->DoAction(DATA_SAPPHIRON_BIRTH); return; - case GO_GOTHIK_GATE: GothikGate = add ? go : NULL; break; - case GO_HORSEMEN_CHEST: HorsemenChest = add ? go : NULL; break; + case GO_GOTHIK_GATE: pGothikGate = add ? pGo : NULL; break; + case GO_HORSEMEN_CHEST: HorsemenChest = add ? pGo : NULL; break; } - AddDoor(go, add); + AddDoor(pGo, add); } void SetData(uint32 id, uint32 value) @@ -150,8 +150,8 @@ struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData HeiganErupt(value); break; case DATA_GOTHIK_GATE: - if (GothikGate) - GothikGate->SetGoState(GOState(value)); + if (pGothikGate) + pGothikGate->SetGoState(GOState(value)); break; } } diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp index f63147489d4..d3d4a771e71 100644 --- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp +++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp @@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI /*void SpellHit(Unit *caster, const SpellEntry *spell) { - //we have no way of telling the creature was hit by spell -> got aura applied after 10-12 seconds + //we have no way of telling the Creature was hit by spell -> got aura applied after 10-12 seconds //then no way for the mobs to actually stop the shutdown as intended. if (spell->Id == SPELL_INTERRUPT_1) DoSay("Silence! I kill you!",LANG_UNIVERSAL, NULL); @@ -124,14 +124,14 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI if (goConsole) { - if (GameObject* go = GameObject::GetGameObject((*m_creature),goConsole)) - go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); + if (GameObject* pGo = GameObject::GetGameObject((*m_creature),goConsole)) + pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); } } - void DoWaveSpawnForCreature(Creature *creature) + void DoWaveSpawnForCreature(Creature* pCreature) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: if (rand()%2) @@ -183,9 +183,9 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI break; } } - void DoFinalSpawnForCreature(Creature *creature) + void DoFinalSpawnForCreature(Creature* pCreature) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { case ENTRY_BNAAR_C_CONSOLE: add = m_creature->SummonCreature(ENTRY_SUNFURY_TECH,2946.52,4201.42,163.47,3.54,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); @@ -260,8 +260,8 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI } if (goConsole) { - if (GameObject* go = GameObject::GetGameObject((*m_creature),goConsole)) - go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); + if (GameObject* pGo = GameObject::GetGameObject((*m_creature),goConsole)) + pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); } ++Phase; break; @@ -287,18 +287,18 @@ CreatureAI* GetAI_npc_manaforge_control_console(Creature* pCreature) ######*/ //TODO: clean up this workaround when Trinity adds support to do it properly (with gossip selections instead of instant summon) -bool GOHello_go_manaforge_control_console(Player* pPlayer, GameObject* _GO) +bool GOHello_go_manaforge_control_console(Player* pPlayer, GameObject* pGo) { - if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) + if (pGo->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) { - pPlayer->PrepareQuestMenu(_GO->GetGUID()); - pPlayer->SendPreparedQuest(_GO->GetGUID()); + pPlayer->PrepareQuestMenu(pGo->GetGUID()); + pPlayer->SendPreparedQuest(pGo->GetGUID()); } Creature* manaforge; manaforge = NULL; - switch(_GO->GetAreaId()) + switch(pGo->GetAreaId()) { case 3726: //b'naar if ((pPlayer->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) && @@ -325,8 +325,8 @@ bool GOHello_go_manaforge_control_console(Player* pPlayer, GameObject* _GO) if (manaforge) { CAST_AI(npc_manaforge_control_consoleAI, manaforge->AI())->someplayer = pPlayer->GetGUID(); - CAST_AI(npc_manaforge_control_consoleAI, manaforge->AI())->goConsole = _GO->GetGUID(); - _GO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); + CAST_AI(npc_manaforge_control_consoleAI, manaforge->AI())->goConsole = pGo->GetGUID(); + pGo->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); } return true; } @@ -649,9 +649,9 @@ bool GossipHello_npc_professor_dabiri(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_professor_dabiri(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_professor_dabiri(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pCreature->CastSpell(pPlayer, SPELL_PHASE_DISTRUPTOR, false); pPlayer->CLOSE_GOSSIP_MENU(); @@ -660,10 +660,10 @@ bool GossipSelect_npc_professor_dabiri(Player* pPlayer, Creature* pCreature, uin return true; } -bool QuestAccept_npc_professor_dabiri(Player* pPlayer, Creature *creature, Quest const *quest) +bool QuestAccept_npc_professor_dabiri(Player* pPlayer, Creature* pCreature, Quest const *quest) { if (quest->GetQuestId() == QUEST_DIMENSIUS) - DoScriptText(WHISPER_DABIRI, creature, pPlayer); + DoScriptText(WHISPER_DABIRI, pCreature, pPlayer); return true; } @@ -870,13 +870,13 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI }; -bool QuestAccept_npc_bessy(Player* pPlayer, Creature* creature, Quest const* quest) +bool QuestAccept_npc_bessy(Player* pPlayer, Creature* pCreature, Quest const* quest) { if (quest->GetQuestId() == Q_ALMABTRIEB) { - creature->setFaction(113); - creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); + pCreature->setFaction(113); + pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); } return true; } diff --git a/src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp b/src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp index 3919abf8c40..169eda90d2a 100644 --- a/src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp +++ b/src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp @@ -107,29 +107,29 @@ struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { case 188527: { - AnomalusContainmentSphere = go->GetGUID(); + AnomalusContainmentSphere = pGo->GetGUID(); if (m_auiEncounter[1] == DONE) - go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; } case 188528: { - OrmoroksContainmentSphere = go->GetGUID(); + OrmoroksContainmentSphere = pGo->GetGUID(); if (m_auiEncounter[2] == DONE) - go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; } case 188526: { - TelestrasContainmentSphere = go->GetGUID(); + TelestrasContainmentSphere = pGo->GetGUID(); if (m_auiEncounter[0] == DONE) - go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); + pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; } } diff --git a/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp b/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp index fd764e1f471..01ba351ff99 100644 --- a/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp +++ b/src/bindings/scripts/scripts/zone/obsidian_sanctum/boss_sartharion.cpp @@ -61,7 +61,7 @@ enum SPELL_TWILIGHT_REVENGE = 60639, SPELL_PYROBUFFET = 56916, // currently used for hard enrage after 15 minutes - SPELL_PYROBUFFET_RANGE = 58907, // possibly used when player get too far away from dummy creatures (2x creature entry 30494) + SPELL_PYROBUFFET_RANGE = 58907, // possibly used when player get too far away from dummy creatures (2x Creature entry 30494) SPELL_TWILIGHT_SHIFT_ENTER = 57620, // enter phase. Player get this when click GO SPELL_TWILIGHT_SHIFT_REMOVAL = 61187, // leave phase diff --git a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp index 632b0e5898a..aa0ddef0581 100644 --- a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp +++ b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp @@ -49,9 +49,9 @@ bool GossipHello_npc_neeru_fireblade(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_neeru_fireblade(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_neeru_fireblade(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -144,12 +144,12 @@ CreatureAI* GetAI_npc_shenthul(Creature* pCreature) return new npc_shenthulAI (pCreature); } -bool QuestAccept_npc_shenthul(Player* pPlayer, Creature* creature, Quest const* quest) +bool QuestAccept_npc_shenthul(Player* pPlayer, Creature* pCreature, Quest const* quest) { if (quest->GetQuestId() == QUEST_SHATTERED_SALUTE) { - CAST_AI(npc_shenthulAI, creature->AI())->CanTalk = true; - CAST_AI(npc_shenthulAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(npc_shenthulAI, pCreature->AI())->CanTalk = true; + CAST_AI(npc_shenthulAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); } return true; } @@ -224,9 +224,9 @@ bool GossipHello_npc_thrall_warchief(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_thrall_warchief(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_thrall_warchief(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); diff --git a/src/bindings/scripts/scripts/zone/razorfen_downs/razorfen_downs.cpp b/src/bindings/scripts/scripts/zone/razorfen_downs/razorfen_downs.cpp index 462a80d215e..7515c5a9195 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_downs/razorfen_downs.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_downs/razorfen_downs.cpp @@ -56,15 +56,15 @@ bool GossipHello_npc_henry_stern (Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_henry_stern (Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_henry_stern (Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pCreature->CastSpell(pPlayer, SPELL_TEACHING_GOLDTHORN_TEA, true); pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_TEA_ANSWER, pCreature->GetGUID()); } - if (action == GOSSIP_ACTION_INFO_DEF + 2) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 2) { pPlayer->SEND_GOSSIP_MENU(GOSSIP_TEXT_POTION_ANSWER, pCreature->GetGUID()); pCreature->CastSpell(pPlayer, SPELL_TEACHING_MIGHTY_TROLLS_BLOOD_POTION, true); diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp b/src/bindings/scripts/scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp index 84f64d8a5b2..94b0943cf3d 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp @@ -58,11 +58,11 @@ struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance return NULL; } - void OnGameObjectCreate(GameObject *go, bool apply) + void OnGameObjectCreate(GameObject* pGo, bool apply) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case 21099: DoorWardGUID = go->GetGUID(); break; + case 21099: DoorWardGUID = pGo->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp index 6a8497d6f06..0c5f01ac52c 100644 --- a/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp +++ b/src/bindings/scripts/scripts/zone/razorfen_kraul/razorfen_kraul.cpp @@ -127,13 +127,13 @@ struct TRINITY_DLL_DECL npc_willixAI : public npc_escortAI } }; -bool QuestAccept_npc_willix(Player* pPlayer, Creature* creature, Quest const* quest) +bool QuestAccept_npc_willix(Player* pPlayer, Creature* pCreature, Quest const* quest) { if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER) { - CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); - DoScriptText(SAY_READY, creature, pPlayer); - creature->setFaction(113); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); + DoScriptText(SAY_READY, pCreature, pPlayer); + pCreature->setFaction(113); } return true; diff --git a/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp b/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp index b926335e79b..04a63a82319 100644 --- a/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp +++ b/src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp @@ -63,25 +63,25 @@ struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance DoorHighInquisitorGUID = 0; } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case ENTRY_PUMPKIN_SHRINE: PumpkinShrineGUID = go->GetGUID();break; - case 104600: DoorHighInquisitorGUID = go->GetGUID(); break; + case ENTRY_PUMPKIN_SHRINE: PumpkinShrineGUID = pGo->GetGUID();break; + case 104600: DoorHighInquisitorGUID = pGo->GetGUID(); break; } } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case ENTRY_HORSEMAN: HorsemanGUID = creature->GetGUID(); break; - case ENTRY_HEAD: HeadGUID = creature->GetGUID(); break; - case ENTRY_PUMPKIN: HorsemanAdds.insert(creature->GetGUID());break; - case 3976: MograineGUID = creature->GetGUID(); break; - case 3977: WhitemaneGUID = creature->GetGUID(); break; - case 3981: VorrelGUID = creature->GetGUID(); break; + case ENTRY_HORSEMAN: HorsemanGUID = pCreature->GetGUID(); break; + case ENTRY_HEAD: HeadGUID = pCreature->GetGUID(); break; + case ENTRY_PUMPKIN: HorsemanAdds.insert(pCreature->GetGUID());break; + case 3976: MograineGUID = pCreature->GetGUID(); break; + case 3977: WhitemaneGUID = pCreature->GetGUID(); break; + case 3981: VorrelGUID = pCreature->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp b/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp index c244700dc49..282d6e9705a 100644 --- a/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp +++ b/src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp @@ -69,18 +69,18 @@ struct TRINITY_DLL_DECL instance_scholomance : public ScriptedInstance IsBossDied[i] = false; } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case GO_GATE_KIRTONOS: GateKirtonosGUID = go->GetGUID(); break; - case GO_GATE_GANDLING: GateGandlingGUID = go->GetGUID(); break; - case GO_GATE_MALICIA: GateMiliciaGUID = go->GetGUID(); break; - case GO_GATE_THEOLEN: GateTheolenGUID = go->GetGUID(); break; - case GO_GATE_POLKELT: GatePolkeltGUID = go->GetGUID(); break; - case GO_GATE_RAVENIAN: GateRavenianGUID = go->GetGUID(); break; - case GO_GATE_BAROV: GateBarovGUID = go->GetGUID(); break; - case GO_GATE_ILLUCIA: GateIlluciaGUID = go->GetGUID(); break; + case GO_GATE_KIRTONOS: GateKirtonosGUID = pGo->GetGUID(); break; + case GO_GATE_GANDLING: GateGandlingGUID = pGo->GetGUID(); break; + case GO_GATE_MALICIA: GateMiliciaGUID = pGo->GetGUID(); break; + case GO_GATE_THEOLEN: GateTheolenGUID = pGo->GetGUID(); break; + case GO_GATE_POLKELT: GatePolkeltGUID = pGo->GetGUID(); break; + case GO_GATE_RAVENIAN: GateRavenianGUID = pGo->GetGUID(); break; + case GO_GATE_BAROV: GateBarovGUID = pGo->GetGUID(); break; + case GO_GATE_ILLUCIA: GateIlluciaGUID = pGo->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp b/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp index 5079fbd155b..a3f8c40acc7 100644 --- a/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp +++ b/src/bindings/scripts/scripts/zone/searing_gorge/searing_gorge.cpp @@ -46,9 +46,9 @@ bool GossipHello_npc_kalaran_windblade(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_kalaran_windblade(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_kalaran_windblade(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Continue please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -83,9 +83,9 @@ bool GossipHello_npc_lothos_riftwaker(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_lothos_riftwaker(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_lothos_riftwaker(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->TeleportTo(409, 1096, -467, -104.6, 3.64); @@ -111,9 +111,9 @@ bool GossipHello_npc_zamael_lunthistle(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_zamael_lunthistle(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_zamael_lunthistle(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); diff --git a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp index 2391af6f15c..5c3cf162b94 100644 --- a/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp +++ b/src/bindings/scripts/scripts/zone/shadowfang_keep/instance_shadowfang_keep.cpp @@ -74,22 +74,22 @@ struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { case GO_COURTYARD_DOOR: - DoorCourtyardGUID = go->GetGUID(); + DoorCourtyardGUID = pGo->GetGUID(); if (m_auiEncounter[0] == DONE) DoUseDoorOrButton(DoorCourtyardGUID); break; case GO_SORCERER_DOOR: - DoorSorcererGUID = go->GetGUID(); + DoorSorcererGUID = pGo->GetGUID(); if (m_auiEncounter[2] == DONE) DoUseDoorOrButton(DoorSorcererGUID); break; case GO_ARUGAL_DOOR: - DoorArugalGUID = go->GetGUID(); + DoorArugalGUID = pGo->GetGUID(); if (m_auiEncounter[3] == DONE) DoUseDoorOrButton(DoorArugalGUID); break; diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp index 418354a5a6c..953675bb28f 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -393,9 +393,9 @@ bool GossipHello_npc_drake_dealer_hurlunk(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_drake_dealer_hurlunk(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_drake_dealer_hurlunk(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_TRADE) + if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; @@ -420,9 +420,9 @@ bool GossipHello_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature* pC return true; } -bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 30658, 1, false); @@ -432,7 +432,7 @@ bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player* pPlayer, Creature* p pPlayer->PlayerTalkClass->ClearMenus(); } } - if (action == GOSSIP_ACTION_INFO_DEF+2) + if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { ItemPosCountVec dest; uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 30659, 1, false); @@ -467,9 +467,9 @@ bool GossipHello_npc_murkblood_overseer(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_murkblood_overseer(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_murkblood_overseer(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -528,9 +528,9 @@ bool GossipHello_npc_neltharaku(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_neltharaku(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_neltharaku(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_SN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); @@ -581,9 +581,9 @@ bool GossipHello_npc_oronok_tornheart(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_oronok_tornheart(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_oronok_tornheart(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_TRADE: pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -631,7 +631,7 @@ enum TAXI_PATH_ID = 649 }; -bool QuestAccept_npc_karynaku(Player* pPlayer, Creature* creature, Quest const* quest) +bool QuestAccept_npc_karynaku(Player* pPlayer, Creature* pCreature, Quest const* quest) { if (quest->GetQuestId() == QUEST_ALLY_OF_NETHER) pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID); //pPlayer->ActivateTaxiPathTo(649); @@ -1044,7 +1044,7 @@ bool QuestAccept_npc_earthmender_wilda(Player* pPlayer, Creature* pCreature, con /* ContentData Battle of the crimson watch - creatures, gameobjects and defines mob_illidari_spawn : Adds that are summoned in the Crimson Watch battle. -mob_torloth_the_magnificent : Final creature that players have to face before quest is completed +mob_torloth_the_magnificent : Final Creature that players have to face before quest is completed npc_lord_illidan_stormrage : Creature that controls the event. go_crystal_prison : GameObject that begins the event and hands out quest EndContentData */ @@ -1058,7 +1058,7 @@ EndContentData */ struct TorlothCinematic { int32 TextId; - uint32 Creature, Timer; + uint32 pCreature, Timer; }; // Creature 0 - Torloth, 1 - Illidan @@ -1270,7 +1270,7 @@ struct TRINITY_DLL_DECL mob_torloth_the_magnificentAI : public ScriptedAI { Creature* pCreature = m_creature; - if (TorlothAnim[AnimationCount].Creature == 1) + if (TorlothAnim[AnimationCount].pCreature == 1) { pCreature = (Unit::GetCreature(*m_creature, LordIllidanGUID)); diff --git a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp index 236cb6a703a..041e1355325 100644 --- a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp +++ b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp @@ -96,9 +96,9 @@ bool GossipHello_npc_raliq_the_drunk(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_raliq_the_drunk(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_raliq_the_drunk(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->setFaction(FACTION_HOSTILE_RD); @@ -221,9 +221,9 @@ bool GossipHello_npc_shattrathflaskvendors(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_shattrathflaskvendors(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_shattrathflaskvendors(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_TRADE) + if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; @@ -245,9 +245,9 @@ bool GossipHello_npc_zephyr(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_zephyr(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_zephyr(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) pPlayer->CastSpell(pPlayer,37778,false); return true; @@ -517,24 +517,24 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI } }; -bool GossipHello_npc_dirty_larry(Player* pPlayer, Creature *creature) +bool GossipHello_npc_dirty_larry(Player* pPlayer, Creature* pCreature) { - if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(QUEST_WBI) == QUEST_STATUS_INCOMPLETE) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOOK, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(creature->GetNpcTextId(), creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pCreature->GetNpcTextId(), pCreature->GetGUID()); return true; } -bool GossipSelect_npc_dirty_larry(Player* pPlayer, Creature *creature, uint32 sender, uint32 action) +bool GossipSelect_npc_dirty_larry(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { - CAST_AI(npc_dirty_larryAI, creature->AI())->Event = true; - CAST_AI(npc_dirty_larryAI, creature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(npc_dirty_larryAI, pCreature->AI())->Event = true; + CAST_AI(npc_dirty_larryAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); pPlayer->CLOSE_GOSSIP_MENU(); } @@ -566,11 +566,11 @@ bool GossipHello_npc_ishanah(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_ishanah(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_ishanah(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) pPlayer->SEND_GOSSIP_MENU(9458, pCreature->GetGUID()); - else if (action == GOSSIP_ACTION_INFO_DEF+2) + else if (uiAction == GOSSIP_ACTION_INFO_DEF+2) pPlayer->SEND_GOSSIP_MENU(9459, pCreature->GetGUID()); return true; @@ -587,50 +587,50 @@ bool GossipSelect_npc_ishanah(Player* pPlayer, Creature* pCreature, uint32 sende #define KHADGAR_GOSSIP_5 "What happened next?" #define KHADGAR_GOSSIP_7 "There was something else I wanted to ask you." -bool GossipHello_npc_khadgar(Player* pPlayer, Creature *creature) +bool GossipHello_npc_khadgar(Player* pPlayer, Creature* pCreature) { - if (creature->isQuestGiver()) - pPlayer->PrepareQuestMenu(creature->GetGUID()); + if (pCreature->isQuestGiver()) + pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (!pPlayer->hasQuest(10211)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9243, creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9243, pCreature->GetGUID()); return true; } -bool GossipSelect_npc_khadgar(Player* pPlayer, Creature *creature, uint32 sender, uint32 action) +bool GossipSelect_npc_khadgar(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - pPlayer->SEND_GOSSIP_MENU(9876, creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9876, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); - pPlayer->SEND_GOSSIP_MENU(9877, creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9877, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); - pPlayer->SEND_GOSSIP_MENU(9878, creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9878, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); - pPlayer->SEND_GOSSIP_MENU(9879, creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9879, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); - pPlayer->SEND_GOSSIP_MENU(9880, creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9880, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); - pPlayer->SEND_GOSSIP_MENU(9881, creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9881, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, KHADGAR_GOSSIP_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - pPlayer->SEND_GOSSIP_MENU(9243, creature->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(9243, pCreature->GetGUID()); break; } return true; diff --git a/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp b/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp index 738170788e6..755cf3aa638 100644 --- a/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp +++ b/src/bindings/scripts/scripts/zone/sholazar_basin/sholazar_basin.cpp @@ -131,9 +131,9 @@ bool GossipHello_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCrea return true; } -bool GossipSelect_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_injured_rainspeaker_oracle(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); CAST_AI(npc_escortAI, (pCreature->AI()))->SetMaxPlayerDistance(35.0f); diff --git a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp index 4d6b73c5cfd..fce271a351d 100644 --- a/src/bindings/scripts/scripts/zone/silithus/silithus.cpp +++ b/src/bindings/scripts/scripts/zone/silithus/silithus.cpp @@ -53,9 +53,9 @@ bool GossipHello_npc_highlord_demitrian(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_highlord_demitrian(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_highlord_demitrian(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); @@ -137,9 +137,9 @@ bool GossipHello_npcs_rutgar_and_frankal(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npcs_rutgar_and_frankal(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npcs_rutgar_and_frankal(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); diff --git a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp index 7a9ee81af08..7daf8a8a50e 100644 --- a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp +++ b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp @@ -69,9 +69,9 @@ bool GossipHello_npc_astor_hadren(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_astor_hadren(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_astor_hadren(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); diff --git a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp index 92cf6598531..78181b0ae3d 100644 --- a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp @@ -60,15 +60,15 @@ bool GossipHello_npc_braug_dimspirit(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_braug_dimspirit(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_braug_dimspirit(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->CastSpell(pPlayer,6766,false); } - if (action == GOSSIP_ACTION_INFO_DEF+2) + if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->AreaExploredOrEventHappens(6627); diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp index 18d93be97ca..d8cfaebc181 100644 --- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp @@ -49,9 +49,9 @@ bool GossipHello_npc_archmage_malin(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_archmage_malin(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_archmage_malin(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF) + if (uiAction == GOSSIP_ACTION_INFO_DEF) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->CastSpell(pPlayer, 42711, true); @@ -212,9 +212,9 @@ bool GossipHello_npc_lady_katrana_prestor(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_lady_katrana_prestor(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_lady_katrana_prestor(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KAT_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); diff --git a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp index fe92138d794..c37b1a904f7 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp @@ -122,53 +122,53 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance if (!goGuid) return; - if (GameObject *go = instance->GetGameObject(goGuid)) + if (GameObject* pGo = instance->GetGameObject(goGuid)) { if (withRestoreTime) - go->UseDoorOrButton(10); + pGo->UseDoorOrButton(10); else - go->SetGoState((GOState)newState); + pGo->SetGoState((GOState)newState); } } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case C_BARON: baronGUID = creature->GetGUID(); break; - case C_YSIDA_TRIGGER: ysidaTriggerGUID = creature->GetGUID(); break; - case C_CRYSTAL: crystalsGUID.insert(creature->GetGUID()); break; + case C_BARON: baronGUID = pCreature->GetGUID(); break; + case C_YSIDA_TRIGGER: ysidaTriggerGUID = pCreature->GetGUID(); break; + case C_CRYSTAL: crystalsGUID.insert(pCreature->GetGUID()); break; case C_ABOM_BILE: - case C_ABOM_VENOM: abomnationGUID.insert(creature->GetGUID()); break; + case C_ABOM_VENOM: abomnationGUID.insert(pCreature->GetGUID()); break; } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case GO_SERVICE_ENTRANCE: serviceEntranceGUID = go->GetGUID(); break; + case GO_SERVICE_ENTRANCE: serviceEntranceGUID = pGo->GetGUID(); break; case GO_GAUNTLET_GATE1: //weird, but unless flag is set, client will not respond as expected. DB bug? - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_LOCKED); - gauntletGate1GUID = go->GetGUID(); + pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_LOCKED); + gauntletGate1GUID = pGo->GetGUID(); break; - case GO_ZIGGURAT1: ziggurat1GUID = go->GetGUID(); break; - case GO_ZIGGURAT2: ziggurat2GUID = go->GetGUID(); break; - case GO_ZIGGURAT3: ziggurat3GUID = go->GetGUID(); break; + case GO_ZIGGURAT1: ziggurat1GUID = pGo->GetGUID(); break; + case GO_ZIGGURAT2: ziggurat2GUID = pGo->GetGUID(); break; + case GO_ZIGGURAT3: ziggurat3GUID = pGo->GetGUID(); break; case GO_ZIGGURAT4: - ziggurat4GUID = go->GetGUID(); + ziggurat4GUID = pGo->GetGUID(); if (TYPE_BARON == DONE || TYPE_RAMSTEIN == DONE) - HandleGameObject(0, true, go); + HandleGameObject(0, true, pGo); break; case GO_ZIGGURAT5: - ziggurat5GUID = go->GetGUID(); + ziggurat5GUID = pGo->GetGUID(); if (TYPE_BARON == DONE || TYPE_RAMSTEIN == DONE) - HandleGameObject(0, true, go); + HandleGameObject(0, true, pGo); break; - case GO_PORT_GAUNTLET: portGauntletGUID = go->GetGUID(); break; - case GO_PORT_SLAUGTHER: portSlaugtherGUID = go->GetGUID(); break; - case GO_PORT_ELDERS: portElderGUID = go->GetGUID(); break; + case GO_PORT_GAUNTLET: portGauntletGUID = pGo->GetGUID(); break; + case GO_PORT_SLAUGTHER: portSlaugtherGUID = pGo->GetGUID(); break; + case GO_PORT_ELDERS: portElderGUID = pGo->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp index 05387558d5a..ea8fe41fef0 100644 --- a/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp +++ b/src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Stratholme SD%Complete: 100 -SDComment: Misc mobs for instance. GO-script to apply aura and start event for quest 8945 +SDComment: Misc mobs for instance. pGo-script to apply aura and start event for quest 8945 SDCategory: Stratholme EndScriptData */ @@ -35,9 +35,9 @@ EndContentData */ ## go_gauntlet_gate (this is the _first_ of the gauntlet gates, two exist) ######*/ -bool GOHello_go_gauntlet_gate(Player* pPlayer, GameObject* _GO) +bool GOHello_go_gauntlet_gate(Player* pPlayer, GameObject* pGo) { - ScriptedInstance* pInstance = _GO->GetInstanceData(); + ScriptedInstance* pInstance = pGo->GetInstanceData(); if (!pInstance) return false; @@ -55,12 +55,12 @@ bool GOHello_go_gauntlet_gate(Player* pPlayer, GameObject* _GO) if (pGroupie->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE && !pGroupie->HasAura(SPELL_BARON_ULTIMATUM) && - pGroupie->GetMap() == _GO->GetMap()) + pGroupie->GetMap() == pGo->GetMap()) pGroupie->CastSpell(pGroupie,SPELL_BARON_ULTIMATUM,true); } } else if (pPlayer->GetQuestStatus(QUEST_DEAD_MAN_PLEA) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasAura(SPELL_BARON_ULTIMATUM) && - pPlayer->GetMap() == _GO->GetMap()) + pPlayer->GetMap() == pGo->GetMap()) pPlayer->CastSpell(pPlayer,SPELL_BARON_ULTIMATUM,true); pInstance->SetData(TYPE_BARON_RUN,IN_PROGRESS); diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp index 2c53f3a0609..874330c0212 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kalecgos.cpp @@ -644,7 +644,7 @@ void boss_kalecgosAI::UpdateAI(const uint32 diff) } } -bool GOkalecgos_teleporter(Player* pPlayer, GameObject* _GO) +bool GOkalecgos_teleporter(Player* pPlayer, GameObject* pGo) { if (pPlayer->HasAura(AURA_SPECTRAL_EXHAUSTION)) pPlayer->GetSession()->SendNotification(GO_FAILED); diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp index 6da1ccd9e24..ec5f1d71988 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp @@ -105,7 +105,7 @@ enum SpellIds SPELL_DARKNESS_OF_A_THOUSAND_SOULS_DAMAGE = 45657, /* Armageddon spells wrong visual */ - SPELL_ARMAGEDDON_TRIGGER = 45909, // Meteor spell trigger missile should cast creature on himself + SPELL_ARMAGEDDON_TRIGGER = 45909, // Meteor spell trigger missile should cast Creature on himself SPELL_ARMAGEDDON_VISUAL = 45911, // Does the hellfire visual to indicate where the meteor missle lands SPELL_ARMAGEDDON_VISUAL2 = 45914, // Does the light visual to indicate where the meteor missle lands SPELL_ARMAGEDDON_VISUAL3 = 24207, // This shouldn't correct but same as seen on the movie @@ -236,7 +236,7 @@ float OrbLocations[4][5] = { struct Speech { int32 textid; - uint32 creature, timer; + uint32 pCreature, timer; }; // TODO: Timers static Speech Sacrifice[]= @@ -258,26 +258,26 @@ class AllOrbsInGrid { public: AllOrbsInGrid() {} - bool operator() (GameObject* go) + bool operator() (GameObject* pGo) { - if (go->GetEntry() == GAMEOBJECT_ORB_OF_THE_BLUE_DRAGONFLIGHT) + if (pGo->GetEntry() == GAMEOBJECT_ORB_OF_THE_BLUE_DRAGONFLIGHT) return true; return false; } }; -bool GOHello_go_orb_of_the_blue_flight(Player* pPlayer, GameObject* go) +bool GOHello_go_orb_of_the_blue_flight(Player* pPlayer, GameObject* pGo) { - if (go->GetUInt32Value(GAMEOBJECT_FACTION) == 35){ - ScriptedInstance* pInstance = go->GetInstanceData(); + if (pGo->GetUInt32Value(GAMEOBJECT_FACTION) == 35){ + ScriptedInstance* pInstance = pGo->GetInstanceData(); float x,y,z; //float dx,dy,dz; - go->SummonCreature(CREATURE_POWER_OF_THE_BLUE_DRAGONFLIGHT, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000); + pGo->SummonCreature(CREATURE_POWER_OF_THE_BLUE_DRAGONFLIGHT, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 121000); pPlayer->CastSpell(pPlayer, SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT, true); - go->SetUInt32Value(GAMEOBJECT_FACTION, 0); + pGo->SetUInt32Value(GAMEOBJECT_FACTION, 0); Creature* Kalec = Unit::GetCreature(*pPlayer, pInstance->GetData64(DATA_KALECGOS_KJ)); //Kalec->RemoveDynObject(SPELL_RING_OF_BLUE_FLAMES); - go->GetPosition(x,y,z); + pGo->GetPosition(x,y,z); // this won't work. need rewritten /* for(uint8 i = 0; i < 4; ++i) @@ -293,7 +293,7 @@ bool GOHello_go_orb_of_the_blue_flight(Player* pPlayer, GameObject* go) } } */ - go->Refresh(); + pGo->Refresh(); } return true; } diff --git a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp index 8ec43d504f1..8b763e9d7b7 100644 --- a/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp +++ b/src/bindings/scripts/scripts/zone/sunwell_plateau/instance_sunwell_plateau.cpp @@ -109,41 +109,41 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance return NULL; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 24850: Kalecgos_Dragon = creature->GetGUID(); break; - case 24891: Kalecgos_Human = creature->GetGUID(); break; - case 24892: Sathrovarr = creature->GetGUID(); break; - case 24882: Brutallus = creature->GetGUID(); break; - case 24895: Madrigosa = creature->GetGUID(); break; - case 25038: Felmyst = creature->GetGUID(); break; - case 25166: Alythess = creature->GetGUID(); break; - case 25165: Sacrolash = creature->GetGUID(); break; - case 25741: Muru = creature->GetGUID(); break; - case 25315: KilJaeden = creature->GetGUID(); break; - case 25608: KilJaedenController = creature->GetGUID(); break; - case 26046: Anveena = creature->GetGUID(); break; - case 25319: KalecgosKJ = creature->GetGUID(); break; + case 24850: Kalecgos_Dragon = pCreature->GetGUID(); break; + case 24891: Kalecgos_Human = pCreature->GetGUID(); break; + case 24892: Sathrovarr = pCreature->GetGUID(); break; + case 24882: Brutallus = pCreature->GetGUID(); break; + case 24895: Madrigosa = pCreature->GetGUID(); break; + case 25038: Felmyst = pCreature->GetGUID(); break; + case 25166: Alythess = pCreature->GetGUID(); break; + case 25165: Sacrolash = pCreature->GetGUID(); break; + case 25741: Muru = pCreature->GetGUID(); break; + case 25315: KilJaeden = pCreature->GetGUID(); break; + case 25608: KilJaedenController = pCreature->GetGUID(); break; + case 26046: Anveena = pCreature->GetGUID(); break; + case 25319: KalecgosKJ = pCreature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case 188421: ForceField = go->GetGUID(); break; + case 188421: ForceField = pGo->GetGUID(); break; case 188075: if (m_auiEncounter[2] == DONE) - HandleGameObject(NULL, true, go); - FireBarrier = go->GetGUID(); + HandleGameObject(NULL, true, pGo); + FireBarrier = pGo->GetGUID(); break; - case 187990: MurusGate[0] = go->GetGUID(); break; + case 187990: MurusGate[0] = pGo->GetGUID(); break; case 188118: if (m_auiEncounter[4] == DONE) - HandleGameObject(NULL, true, go); - MurusGate[1]= go->GetGUID(); + HandleGameObject(NULL, true, pGo); + MurusGate[1]= pGo->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp index a12da0c5f80..08359819d5b 100644 --- a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp +++ b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp @@ -238,9 +238,9 @@ bool GossipHello_npc_marin_noggenfogger(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_marin_noggenfogger(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_marin_noggenfogger(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_TRADE) + if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; @@ -268,7 +268,7 @@ bool GossipHello_npc_steward_of_time(Player* pPlayer, Creature* pCreature) return true; } -bool QuestAccept_npc_steward_of_time(Player* pPlayer, Creature *creature, Quest const *quest) +bool QuestAccept_npc_steward_of_time(Player* pPlayer, Creature* pCreature, Quest const *quest) { if (quest->GetQuestId() == 10279) //Quest: To The Master's Lair pPlayer->CastSpell(pPlayer,34891,true); //(Flight through Caverns) @@ -276,9 +276,9 @@ bool QuestAccept_npc_steward_of_time(Player* pPlayer, Creature *creature, Quest return false; } -bool GossipSelect_npc_steward_of_time(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_steward_of_time(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CastSpell(pPlayer,34891,true); //(Flight through Caverns) return true; @@ -308,9 +308,9 @@ bool GossipHello_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCrea return true; } -bool GossipSelect_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_stone_watcher_of_norgannon(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_NORGANNON_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp index 93033e52433..081c80c56e5 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp @@ -90,26 +90,26 @@ struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance return false; } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case CONTAINMENT_CORE_SECURITY_FIELD_ALPHA: Containment_Core_Security_Field_Alpha = go; break; - case CONTAINMENT_CORE_SECURITY_FIELD_BETA: Containment_Core_Security_Field_Beta = go; break; - case SEAL_SPHERE: GoSphereGUID = go->GetGUID(); break; - case POD_ALPHA: Pod_Alpha = go; break; - case POD_BETA: Pod_Beta = go; break; - case POD_DELTA: Pod_Delta = go; break; - case POD_GAMMA: Pod_Gamma = go; break; - case POD_OMEGA: Pod_Omega = go; break; - //case WARDENS_SHIELD: Wardens_Shield = go; break; + case CONTAINMENT_CORE_SECURITY_FIELD_ALPHA: Containment_Core_Security_Field_Alpha = pGo; break; + case CONTAINMENT_CORE_SECURITY_FIELD_BETA: Containment_Core_Security_Field_Beta = pGo; break; + case SEAL_SPHERE: GoSphereGUID = pGo->GetGUID(); break; + case POD_ALPHA: Pod_Alpha = pGo; break; + case POD_BETA: Pod_Beta = pGo; break; + case POD_DELTA: Pod_Delta = pGo; break; + case POD_GAMMA: Pod_Gamma = pGo; break; + case POD_OMEGA: Pod_Omega = pGo; break; + //case WARDENS_SHIELD: Wardens_Shield = pGo; break; } } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - if (creature->GetEntry() == MELLICHAR) - MellicharGUID = creature->GetGUID(); + if (pCreature->GetEntry() == MELLICHAR) + MellicharGUID = pCreature->GetGUID(); } void SetData(uint32 type, uint32 data) diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp index 844338db77f..f973f96c1ff 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp @@ -74,17 +74,17 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance return false; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 20064: ThaladredTheDarkener = creature->GetGUID(); break; - case 20063: MasterEngineerTelonicus = creature->GetGUID(); break; - case 20062: GrandAstromancerCapernian = creature->GetGUID(); break; - case 20060: LordSanguinar = creature->GetGUID(); break; - case 19622: Kaelthas = creature->GetGUID(); break; - case 18805: Astromancer = creature->GetGUID(); break; - case 19514: Alar = creature->GetGUID(); break; + case 20064: ThaladredTheDarkener = pCreature->GetGUID(); break; + case 20063: MasterEngineerTelonicus = pCreature->GetGUID(); break; + case 20062: GrandAstromancerCapernian = pCreature->GetGUID(); break; + case 20060: LordSanguinar = pCreature->GetGUID(); break; + case 19622: Kaelthas = pCreature->GetGUID(); break; + case 18805: Astromancer = pCreature->GetGUID(); break; + case 19514: Alar = pCreature->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp index 3640436cff8..489a415cf81 100644 --- a/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp @@ -59,15 +59,15 @@ struct TRINITY_DLL_DECL instance_temple_of_ahnqiraj : public ScriptedInstance CthunPhase = 0; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch (creature->GetEntry()) + switch (pCreature->GetEntry()) { - case 15263: SkeramGUID = creature->GetGUID(); break; - case 15544: VemGUID = creature->GetGUID(); break; - case 15511: KriGUID = creature->GetGUID(); break; - case 15276: VeklorGUID = creature->GetGUID(); break; - case 15275: VeknilashGUID = creature->GetGUID(); break; + case 15263: SkeramGUID = pCreature->GetGUID(); break; + case 15544: VemGUID = pCreature->GetGUID(); break; + case 15511: KriGUID = pCreature->GetGUID(); break; + case 15276: VeklorGUID = pCreature->GetGUID(); break; + case 15275: VeknilashGUID = pCreature->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp index 2cf024a66b7..783c7c3e5cb 100644 --- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp +++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp @@ -381,14 +381,14 @@ bool GossipHello_npc_floon(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_floon(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_floon(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF) + if (uiAction == GOSSIP_ACTION_INFO_DEF) { pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLOON2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(9443, pCreature->GetGUID()); } - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->setFaction(FACTION_HOSTILE_FL); @@ -480,12 +480,12 @@ struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI } }; -bool QuestAccept_npc_isla_starmane(Player* pPlayer, Creature* creature, Quest const* quest) +bool QuestAccept_npc_isla_starmane(Player* pPlayer, Creature* pCreature, Quest const* quest) { if (quest->GetQuestId() == QUEST_EFTW_H || quest->GetQuestId() == QUEST_EFTW_A) { - CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID()); - creature->setFaction(113); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(true, false, pPlayer->GetGUID()); + pCreature->setFaction(113); } return true; } @@ -541,7 +541,7 @@ CreatureAI* GetAI_npc_isla_starmaneAI(Creature* pCreature) #define GOSSIP_S_GEZZARAK_THE_HUNTRESS "Summon Gezzarak the Huntress" #define GOSSIP_S_VAKKIZ_THE_WINDRAGER "Summon Vakkiz the Windrager" -bool GossipHello_go_skull_pile(Player* pPlayer, GameObject* _GO) +bool GossipHello_go_skull_pile(Player* pPlayer, GameObject* pGo) { if ((pPlayer->GetQuestStatus(11885) == QUEST_STATUS_INCOMPLETE) || pPlayer->GetQuestRewardStatus(11885)) { @@ -551,13 +551,13 @@ bool GossipHello_go_skull_pile(Player* pPlayer, GameObject* _GO) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_S_VAKKIZ_THE_WINDRAGER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); } - pPlayer->SEND_GOSSIP_MENU(_GO->GetGOInfo()->questgiver.gossipID, _GO->GetGUID()); + pPlayer->SEND_GOSSIP_MENU(pGo->GetGOInfo()->questgiver.gossipID, pGo->GetGUID()); return true; } -void SendActionMenu_go_skull_pile(Player* pPlayer, GameObject* _GO, uint32 action) +void SendActionMenu_go_skull_pile(Player* pPlayer, GameObject* pGo, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF + 1: pPlayer->CastSpell(pPlayer,40642,false); @@ -574,11 +574,11 @@ void SendActionMenu_go_skull_pile(Player* pPlayer, GameObject* _GO, uint32 actio } } -bool GossipSelect_go_skull_pile(Player* pPlayer, GameObject* _GO, uint32 sender, uint32 action) +bool GossipSelect_go_skull_pile(Player* pPlayer, GameObject* pGo, uint32 uiSender, uint32 uiAction) { - switch(sender) + switch(uiSender) { - case GOSSIP_SENDER_MAIN: SendActionMenu_go_skull_pile(pPlayer, _GO, action); break; + case GOSSIP_SENDER_MAIN: SendActionMenu_go_skull_pile(pPlayer, pGo, uiAction); break; } return true; } 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 7595e40453c..bb3bcc8ba5b 100644 --- a/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp +++ b/src/bindings/scripts/scripts/zone/thousand_needles/thousand_needles.cpp @@ -360,9 +360,9 @@ bool GossipHello_npc_plucky(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_plucky(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_plucky(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->CLOSE_GOSSIP_MENU(); diff --git a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp index f612e163a79..f3f21e65440 100644 --- a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp +++ b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp @@ -114,9 +114,9 @@ bool GossipHello_npc_cairne_bloodhoof(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_cairne_bloodhoof(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_cairne_bloodhoof(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_SENDER_INFO) + if (uiAction == GOSSIP_SENDER_INFO) { pPlayer->CastSpell(pPlayer, 23123, false); pPlayer->SEND_GOSSIP_MENU(7014, pCreature->GetGUID()); diff --git a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp index 9e24e72e387..43628a6565e 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/boss_archaedas.cpp @@ -300,10 +300,10 @@ uint64 altarOfArchaedasCount[5]; int32 altarOfArchaedasCounter=0; -bool GOHello_go_altar_of_archaedas(Player* pPlayer, GameObject* go) +bool GOHello_go_altar_of_archaedas(Player* pPlayer, GameObject* pGo) { bool alreadyUsed; - go->AddUse (); + pGo->AddUse (); alreadyUsed = false; for (uint32 loop=0; loop<5; loop++) { @@ -414,14 +414,14 @@ EndScriptData */ static uint64 altarOfTheKeeperCount[5]; static uint32 altarOfTheKeeperCounter=0; -bool GOHello_go_altar_of_the_keepers(Player* pPlayer, GameObject* go) +bool GOHello_go_altar_of_the_keepers(Player* pPlayer, GameObject* pGo) { ScriptedInstance* pInstance = (pPlayer->GetInstanceData()); if (!pInstance) return true; bool alreadyUsed; - go->AddUse (); + pGo->AddUse (); alreadyUsed = false; for (uint32 loop=0; loop<5; ++loop) diff --git a/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp index 033eed0a737..21b639e2449 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/instance_uldaman.cpp @@ -57,43 +57,43 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance std::vector earthenGuardian; std::vector archaedasWallMinions; // minions lined up around the wall - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch (go->GetEntry()) + switch (pGo->GetEntry()) { case ALTAR_OF_THE_KEEPER_TEMPLE_DOOR: // lock the door - altarOfTheKeeperTempleDoor = go->GetGUID(); + altarOfTheKeeperTempleDoor = pGo->GetGUID(); break; case ARCHAEDAS_TEMPLE_DOOR: - archaedasTempleDoor = go->GetGUID(); + archaedasTempleDoor = pGo->GetGUID(); break; case ANCIENT_VAULT_DOOR: - go->SetGoState(GO_STATE_READY); - go->SetUInt32Value(GAMEOBJECT_FLAGS, 33); - ancientVaultDoor = go->GetGUID(); + pGo->SetGoState(GO_STATE_READY); + pGo->SetUInt32Value(GAMEOBJECT_FLAGS, 33); + ancientVaultDoor = pGo->GetGUID(); break; } } - void SetFrozenState(Creature *creature) + void SetFrozenState(Creature* pCreature) { - creature->setFaction(35); - creature->RemoveAllAuras(); + pCreature->setFaction(35); + pCreature->RemoveAllAuras(); //creature->RemoveFlag (UNIT_FIELD_FLAGS,UNIT_FLAG_ANIMATION_FROZEN); - creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); - creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); } void OpenDoor(uint64 guid) { - GameObject *go = instance->GetGameObject(guid); - if (!go) + GameObject* pGo = instance->GetGameObject(guid); + if (!pGo) return; - go->SetUInt32Value(GAMEOBJECT_FLAGS, 33); - go->SetGoState(GO_STATE_ACTIVE); + pGo->SetUInt32Value(GAMEOBJECT_FLAGS, 33); + pGo->SetGoState(GO_STATE_ACTIVE); } void ActivateStoneKeepers() @@ -238,32 +238,32 @@ struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch (creature->GetEntry()) { + switch (pCreature->GetEntry()) { case 4857: // Stone Keeper - SetFrozenState (creature); - stoneKeeper.push_back(creature->GetGUID()); + SetFrozenState (pCreature); + stoneKeeper.push_back(pCreature->GetGUID()); break; case 7309: // Earthen Custodian - archaedasWallMinions.push_back(creature->GetGUID()); + archaedasWallMinions.push_back(pCreature->GetGUID()); break; case 7077: // Earthen Hallshaper - archaedasWallMinions.push_back(creature->GetGUID()); + archaedasWallMinions.push_back(pCreature->GetGUID()); break; case 7076: // Earthen Guardian - earthenGuardian.push_back(creature->GetGUID()); + earthenGuardian.push_back(pCreature->GetGUID()); break; case 10120: // Vault Walker - vaultWalker.push_back(creature->GetGUID()); + vaultWalker.push_back(pCreature->GetGUID()); break; case 2748: // Archaedas - archaedasGUID = creature->GetGUID(); + archaedasGUID = pCreature->GetGUID(); break; } // end switch diff --git a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp index 2817c2e8a26..730dcac211a 100644 --- a/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp +++ b/src/bindings/scripts/scripts/zone/uldaman/uldaman.cpp @@ -98,9 +98,9 @@ bool GossipHello_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature* pCreatu return true; } -bool GossipSelect_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_lore_keeper_of_norgannon(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "What is a \"subterranean being matrix\"?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); diff --git a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp index d3faa7e0995..8b27dc1beeb 100644 --- a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp +++ b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp @@ -223,14 +223,14 @@ bool GossipHello_npc_parqual_fintallas(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_parqual_fintallas(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_parqual_fintallas(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->CastSpell(pPlayer,SPELL_MARK_OF_SHAME,false); } - if (action == GOSSIP_ACTION_INFO_DEF+2) + if (uiAction == GOSSIP_ACTION_INFO_DEF+2) { pPlayer->CLOSE_GOSSIP_MENU(); pPlayer->AreaExploredOrEventHappens(6628); diff --git a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp index 5fa2e26fc85..a94e253c255 100644 --- a/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp +++ b/src/bindings/scripts/scripts/zone/ungoro_crater/ungoro_crater.cpp @@ -120,15 +120,15 @@ struct TRINITY_DLL_DECL npc_ameAI : public npc_escortAI } }; -bool QuestAccept_npc_ame(Player* pPlayer, Creature* creature, Quest const* quest) +bool QuestAccept_npc_ame(Player* pPlayer, Creature* pCreature, Quest const* quest) { if (quest->GetQuestId() == QUEST_CHASING_AME) { - CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, pPlayer->GetGUID()); - DoScriptText(SAY_READY, creature, pPlayer); - creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); + CAST_AI(npc_escortAI, (pCreature->AI()))->Start(false, false, pPlayer->GetGUID()); + DoScriptText(SAY_READY, pCreature, pPlayer); + pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); // Change faction so mobs attack - creature->setFaction(113); + pCreature->setFaction(113); } return true; } diff --git a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp index f34a07c082f..4c7668970da 100644 --- a/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp +++ b/src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp @@ -104,31 +104,31 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance return NULL; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 23953: Keleseth = creature->GetGUID(); break; - case 24201: Dalronn = creature->GetGUID(); break; - case 24200: Skarvald = creature->GetGUID(); break; - case 23954: Ingvar = creature->GetGUID(); break; + case 23953: Keleseth = pCreature->GetGUID(); break; + case 24201: Dalronn = pCreature->GetGUID(); break; + case 24200: Skarvald = pCreature->GetGUID(); break; + case 23954: Ingvar = pCreature->GetGUID(); break; } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { //door and object id - case ENTRY_BELLOW_1: forge_bellow[0] = go->GetGUID(); break; - case ENTRY_BELLOW_2: forge_bellow[1] = go->GetGUID(); break; - case ENTRY_BELLOW_3: forge_bellow[2] = go->GetGUID(); break; - case ENTRY_FORGEFIRE_1: forge_fire[0] = go->GetGUID(); break; - case ENTRY_FORGEFIRE_2: forge_fire[1] = go->GetGUID(); break; - case ENTRY_FORGEFIRE_3: forge_fire[2] = go->GetGUID(); break; - case ENTRY_GLOWING_ANVIL_1: forge_anvil[0] = go->GetGUID(); break; - case ENTRY_GLOWING_ANVIL_2: forge_anvil[1] = go->GetGUID(); break; - case ENTRY_GLOWING_ANVIL_3: forge_anvil[2] = go->GetGUID(); break; + case ENTRY_BELLOW_1: forge_bellow[0] = pGo->GetGUID(); break; + case ENTRY_BELLOW_2: forge_bellow[1] = pGo->GetGUID(); break; + case ENTRY_BELLOW_3: forge_bellow[2] = pGo->GetGUID(); break; + case ENTRY_FORGEFIRE_1: forge_fire[0] = pGo->GetGUID(); break; + case ENTRY_FORGEFIRE_2: forge_fire[1] = pGo->GetGUID(); break; + case ENTRY_FORGEFIRE_3: forge_fire[2] = pGo->GetGUID(); break; + case ENTRY_GLOWING_ANVIL_1: forge_anvil[0] = pGo->GetGUID(); break; + case ENTRY_GLOWING_ANVIL_2: forge_anvil[1] = pGo->GetGUID(); break; + case ENTRY_GLOWING_ANVIL_3: forge_anvil[2] = pGo->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp b/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp index 6bb97e8b301..1db6e7b0c10 100644 --- a/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp +++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp @@ -29,12 +29,12 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance return false; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { - case 31125: Archavon = creature->GetGUID(); break; - case 33993: Emalon = creature->GetGUID(); break; + case 31125: Archavon = pCreature->GetGUID(); break; + case 33993: Emalon = pCreature->GetGUID(); break; } } diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp b/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp index c41568f1a93..e535a20a2c1 100644 --- a/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp +++ b/src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp @@ -43,10 +43,10 @@ struct TRINITY_DLL_DECL instance_wailing_caverns : public ScriptedInstance NaralexGUID = 0; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - if (creature->GetEntry() == DATA_NARALEX) - NaralexGUID = creature->GetGUID(); + if (pCreature->GetEntry() == DATA_NARALEX) + NaralexGUID = pCreature->GetGUID(); } void SetData(uint32 type, uint32 data) diff --git a/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp b/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp index f1aa7795e86..864e0eb2a9b 100644 --- a/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp +++ b/src/bindings/scripts/scripts/zone/wailing_caverns/wailing_caverns.cpp @@ -382,10 +382,10 @@ bool GossipHello_npc_disciple_of_naralex(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_disciple_of_naralex(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_disciple_of_naralex(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { ScriptedInstance *pInstance = (pCreature->GetInstanceData()); - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->CLOSE_GOSSIP_MENU(); if (pInstance)pInstance->SetData(TYPE_NARALEX_EVENT, IN_PROGRESS); diff --git a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp index abf5f78b060..edbc94f55ef 100644 --- a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp +++ b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp @@ -60,9 +60,9 @@ bool GossipHello_npcs_dithers_and_arbington(Player* pPlayer, Creature* pCreature return true; } -bool GossipSelect_npcs_dithers_and_arbington(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npcs_dithers_and_arbington(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch(action) + switch(uiAction) { case GOSSIP_ACTION_TRADE: pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); @@ -122,9 +122,9 @@ bool GossipHello_npc_myranda_the_hag(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_myranda_the_hag(Player* pPlayer, Creature* pCreature, uint32 Sender, uint32 Action) +bool GossipSelect_npc_myranda_the_hag(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (Action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->CastSpell(pPlayer, SPELL_SCARLET_ILLUSION, false); diff --git a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp index 714fa7311da..d5743869108 100644 --- a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp +++ b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp @@ -54,9 +54,9 @@ bool GossipHello_npc_lorax(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_lorax(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_lorax(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -103,9 +103,9 @@ bool GossipHello_npc_rivern_frostwind(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_rivern_frostwind(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_rivern_frostwind(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_TRADE) + if (uiAction == GOSSIP_ACTION_TRADE) pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); return true; @@ -132,9 +132,9 @@ bool GossipHello_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_witch_doctor_mauari(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action==GOSSIP_ACTION_INFO_DEF+1) + if (uiAction ==GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->CastSpell(pPlayer, 16351, false); diff --git a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp index c297819764f..427f80b421d 100644 --- a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp +++ b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp @@ -55,15 +55,15 @@ bool GossipHello_npcs_ashyen_and_keleth(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npcs_ashyen_and_keleth(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npcs_ashyen_and_keleth(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pCreature->setPowerType(POWER_MANA); pCreature->SetMaxPower(POWER_MANA,200); //set a "fake" mana value, we can't depend on database doing it in this case pCreature->SetPower(POWER_MANA,200); - if (pCreature->GetEntry() == 17900) //check which creature we are dealing with + if (pCreature->GetEntry() == 17900) //check which Creature we are dealing with { switch (pPlayer->GetReputationRank(942)) { //mark of lore @@ -175,9 +175,9 @@ bool GossipHello_npc_cooshcoosh(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_cooshcoosh(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_cooshcoosh(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF) + if (uiAction == GOSSIP_ACTION_INFO_DEF) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->setFaction(FACTION_HOSTILE_CO); @@ -204,9 +204,9 @@ bool GossipHello_npc_elder_kuruti(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_elder_kuruti(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_elder_kuruti(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - switch (action) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KUR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); @@ -250,9 +250,9 @@ bool GossipHello_npc_mortog_steamhead(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_mortog_steamhead(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_mortog_steamhead(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_TRADE) + if (uiAction == GOSSIP_ACTION_TRADE) { pPlayer->SEND_VENDORLIST(pCreature->GetGUID()); } diff --git a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp index 6ff4d84ae67..46a6c0dac59 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp @@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI BombCount = 0; } - bool HatchAllEggs(uint32 action) //1: reset, 2: isHatching all + bool HatchAllEggs(uint32 uiAction) //1: reset, 2: isHatching all { std::list templist; float x, y, z; @@ -253,9 +253,9 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI for(std::list::iterator i = templist.begin(); i != templist.end(); ++i) { - if (action == 1) + if (uiAction == 1) (*i)->SetDisplayId(10056); - else if (action == 2 &&(*i)->GetDisplayId() != 11686) + else if (uiAction == 2 &&(*i)->GetDisplayId() != 11686) (*i)->CastSpell(*i, SPELL_HATCH_EGG, false); } return true; diff --git a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp index 716c5876c0b..74186442d9e 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp @@ -36,7 +36,7 @@ EndScriptData */ // But we cannot add loots to gameobject, so we have to use the fixed loot_template struct SHostageInfo { - uint32 npc, go; + uint32 npc, pGo; float x, y, z, o; }; @@ -104,9 +104,9 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance return false; } - void OnCreatureCreate(Creature *creature, bool add) + void OnCreatureCreate(Creature* pCreature, bool add) { - switch(creature->GetEntry()) + switch(pCreature->GetEntry()) { case 23578://janalai case 23863://zuljin @@ -117,20 +117,20 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance } } - void OnGameObjectCreate(GameObject *go, bool add) + void OnGameObjectCreate(GameObject* pGo, bool add) { - switch(go->GetEntry()) + switch(pGo->GetEntry()) { - case 186303: HalazziDoorGUID = go->GetGUID(); break; - case 186304: ZulJinGateGUID = go->GetGUID(); break; - case 186305: HexLordGateGUID = go->GetGUID(); break; - case 186858: AkilzonDoorGUID = go->GetGUID(); break; - case 186859: ZulJinDoorGUID = go->GetGUID(); break; - - case 187021: HarkorsSatchelGUID = go->GetGUID(); break; - case 186648: TanzarsTrunkGUID = go->GetGUID(); break; - case 186672: AshlisBagGUID = go->GetGUID(); break; - case 186667: KrazsPackageGUID = go->GetGUID(); break; + case 186303: HalazziDoorGUID = pGo->GetGUID(); break; + case 186304: ZulJinGateGUID = pGo->GetGUID(); break; + case 186305: HexLordGateGUID = pGo->GetGUID(); break; + case 186858: AkilzonDoorGUID = pGo->GetGUID(); break; + case 186859: ZulJinDoorGUID = pGo->GetGUID(); break; + + case 187021: HarkorsSatchelGUID = pGo->GetGUID(); break; + case 186648: TanzarsTrunkGUID = pGo->GetGUID(); break; + case 186672: AshlisBagGUID = pGo->GetGUID(); break; + case 186667: KrazsPackageGUID = pGo->GetGUID(); break; default: break; } diff --git a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp index 74c6a914534..86cb3196ab7 100644 --- a/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp +++ b/src/bindings/scripts/scripts/zone/zulaman/zulaman.cpp @@ -130,9 +130,9 @@ bool GossipHello_npc_zulaman_hostage(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_zulaman_hostage(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_zulaman_hostage(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF + 1) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) pPlayer->CLOSE_GOSSIP_MENU(); if (!pCreature->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP)) diff --git a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp index e2228c863f8..4e630368db1 100644 --- a/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp +++ b/src/bindings/scripts/scripts/zone/zulfarrak/zulfarrak.cpp @@ -115,9 +115,9 @@ bool GossipHello_npc_sergeant_bly(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_sergeant_bly(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_sergeant_bly(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); pCreature->setFaction(FACTION_HOSTILE); @@ -192,9 +192,9 @@ bool GossipHello_npc_weegli_blastfuse(Player* pPlayer, Creature* pCreature) return true; } -bool GossipSelect_npc_weegli_blastfuse(Player* pPlayer, Creature* pCreature, uint32 sender, uint32 action) +bool GossipSelect_npc_weegli_blastfuse(Player* pPlayer, Creature* pCreature, uint32 uiSender, uint32 uiAction) { - if (action == GOSSIP_ACTION_INFO_DEF+1) + if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); //here we make him run to door, set the charge and run away off to nowhere -- cgit v1.2.3