josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge [SD2] Apply SD2 code style

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Kudlaty
2009-08-14 00:02:13 +02:00
parent 8212baca88
commit f58781dbad
371 changed files with 8795 additions and 8795 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/custom/custom_example.cpp
+9 -9
View File
@@ -216,37 +216,37 @@ CreatureAI* GetAI_custom_example(Creature *_Creature)
} }
//This function is called when the player clicks an option on the gossip menu //This function is called when the player clicks an option on the gossip menu
void SendDefaultMenu_custom_example(Player *player, Creature *_Creature, uint32 action) void SendDefaultMenu_custom_example(Player* pPlayer, Creature *_Creature, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
{ {
//Set our faction to hostile twoards all //Set our faction to hostile twoards all
_Creature->setFaction(24); _Creature->setFaction(24);
_Creature->Attack(player, true); _Creature->Attack(pPlayer, true);
player->PlayerTalkClass->CloseGossip(); pPlayer->PlayerTalkClass->CloseGossip();
} }
} }
//This function is called when the player clicks an option on the gossip menu //This function is called when the player clicks an option on the gossip menu
bool GossipSelect_custom_example(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_custom_example(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (sender == GOSSIP_SENDER_MAIN) if (sender == GOSSIP_SENDER_MAIN)
SendDefaultMenu_custom_example(player, _Creature, action); SendDefaultMenu_custom_example(pPlayer, _Creature, action);
return true; return true;
} }
//This function is called when the player opens the gossip menu //This function is called when the player opens the gossip menu
bool GossipHello_custom_example(Player *player, Creature *_Creature) bool GossipHello_custom_example(Player* pPlayer, Creature *_Creature)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
return true; return true;
} }
//Our Recive emote function //Our Recive emote function
bool ReceiveEmote_custom_example(Player *player, Creature *_Creature, uint32 emote) bool ReceiveEmote_custom_example(Player* pPlayer, Creature *_Creature, uint32 emote)
{ {
_Creature->HandleEmoteCommand(emote); _Creature->HandleEmoteCommand(emote);
src/bindings/scripts/scripts/custom/custom_gossip_codebox.cpp
+11 -11
View File
@@ -25,43 +25,43 @@ EndScriptData */
#include <cstring> #include <cstring>
//This function is called when the player opens the gossip menubool //This function is called when the player opens the gossip menubool
bool GossipHello_custom_gossip_codebox(Player *player, Creature *_Creature) bool GossipHello_custom_gossip_codebox(Player* pPlayer, Creature *_Creature)
{ {
player->ADD_GOSSIP_ITEM_EXTENDED(0, "A quiz: what's your name?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true); pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, "A quiz: what's your name?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'm not interested", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'm not interested", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
return true; return true;
} }
//This function is called when the player clicks an option on the gossip menubool //This function is called when the player clicks an option on the gossip menubool
bool GossipSelect_custom_gossip_codebox(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_custom_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+2) if (action == GOSSIP_ACTION_INFO_DEF+2)
{ {
_Creature->Say("Normal select, guess you're not interested.", LANG_UNIVERSAL, 0); _Creature->Say("Normal select, guess you're not interested.", LANG_UNIVERSAL, 0);
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
} }
return true; return true;
} }
bool GossipSelectWithCode_custom_gossip_codebox( Player *player, Creature *_Creature, uint32 sender, uint32 action, const char* sCode ) bool GossipSelectWithCode_custom_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action, const char* sCode)
{ {
if (sender == GOSSIP_SENDER_MAIN) if (sender == GOSSIP_SENDER_MAIN)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+1) if (action == GOSSIP_ACTION_INFO_DEF+1)
{ {
if(std::strcmp(sCode, player->GetName())!=0) if (std::strcmp(sCode, pPlayer->GetName())!=0)
{ {
_Creature->Say("Wrong!", LANG_UNIVERSAL, 0); _Creature->Say("Wrong!", LANG_UNIVERSAL, 0);
_Creature->CastSpell(player, 12826, true); _Creature->CastSpell(pPlayer, 12826, true);
} }
else else
{ {
_Creature->Say("You're right, you are allowed to see my inner secrets.", LANG_UNIVERSAL, 0); _Creature->Say("You're right, you are allowed to see my inner secrets.", LANG_UNIVERSAL, 0);
_Creature->CastSpell(player, 26990, true); _Creature->CastSpell(pPlayer, 26990, true);
} }
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
return true; return true;
} }
} }
src/bindings/scripts/scripts/custom/npc_acherus_taxi.cpp
+8 -8
View File
@@ -3,24 +3,24 @@
#define GOSSIP_FLIGHT "I need a ride" #define GOSSIP_FLIGHT "I need a ride"
bool GossipHello_npc_acherus_taxi(Player *player, Creature *_Creature) bool GossipHello_npc_acherus_taxi(Player* pPlayer, Creature *_Creature)
{ {
player->SetTaxiCheater(true); pPlayer->SetTaxiCheater(true);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(9978,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9978,_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_acherus_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_acherus_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1) if (action == GOSSIP_ACTION_INFO_DEF + 1)
{ {
if (player->GetPositionZ() >=316) if (pPlayer->GetPositionZ() >=316)
{ {
player->GetSession()->SendDoFlight(24446, 1053); pPlayer->GetSession()->SendDoFlight(24446, 1053);
}else{ }else{
player->GetSession()->SendDoFlight(24446, 1054); pPlayer->GetSession()->SendDoFlight(24446, 1054);
} }
} }
src/bindings/scripts/scripts/custom/npc_wyrmresttempel_taxi.cpp
+24 -24
View File
@@ -8,84 +8,84 @@
#define GOSSIP_BOTTOM "Yes, Please. I would like to return to the ground floor of the temple." #define GOSSIP_BOTTOM "Yes, Please. I would like to return to the ground floor of the temple."
#define GOSSIP_ONEDOWN "I would like to see Lord Afrasastrasz, in the middle of the temple." #define GOSSIP_ONEDOWN "I would like to see Lord Afrasastrasz, in the middle of the temple."
bool GossipHello_npc_wyrmresttempel_middle_taxi(Player *player, Creature *_Creature) bool GossipHello_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature *_Creature)
{ {
player->SetTaxiCheater(true); pPlayer->SetTaxiCheater(true);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_UP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(12887,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(12887,_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_wyrmresttempel_middle_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1) if (action == GOSSIP_ACTION_INFO_DEF + 1)
{ {
player->GetSession()->SendDoFlight(6376, 881); pPlayer->GetSession()->SendDoFlight(6376, 881);
} }
if (action == GOSSIP_ACTION_INFO_DEF + 2) if (action == GOSSIP_ACTION_INFO_DEF + 2)
{ {
player->GetSession()->SendDoFlight(6376, 882); pPlayer->GetSession()->SendDoFlight(6376, 882);
} }
return true; return true;
} }
bool GossipHello_npc_wyrmresttempel_bottom_taxi(Player *player, Creature *_Creature) bool GossipHello_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature *_Creature)
{ {
player->SetTaxiCheater(true); pPlayer->SetTaxiCheater(true);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TOP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_TOP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MIDDLE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MIDDLE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(12713,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(12713,_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_wyrmresttempel_bottom_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 4) if (action == GOSSIP_ACTION_INFO_DEF + 4)
{ {
player->GetSession()->SendDoFlight(6376, 878); pPlayer->GetSession()->SendDoFlight(6376, 878);
} }
if (action == GOSSIP_ACTION_INFO_DEF + 3) if (action == GOSSIP_ACTION_INFO_DEF + 3)
{ {
player->GetSession()->SendDoFlight(6376, 883); pPlayer->GetSession()->SendDoFlight(6376, 883);
} }
return true; return true;
} }
bool GossipHello_npc_wyrmresttempel_top_taxi(Player *player, Creature *_Creature) bool GossipHello_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature *_Creature)
{ {
player->SetTaxiCheater(true); pPlayer->SetTaxiCheater(true);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOTTOM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BOTTOM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ONEDOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ONEDOWN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
player->SEND_GOSSIP_MENU(12714,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(12714,_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_wyrmresttempel_top_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_wyrmresttempel_top_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 5) if (action == GOSSIP_ACTION_INFO_DEF + 5)
{ {
player->GetSession()->SendDoFlight(6376, 879); pPlayer->GetSession()->SendDoFlight(6376, 879);
} }
if (action == GOSSIP_ACTION_INFO_DEF + 6) if (action == GOSSIP_ACTION_INFO_DEF + 6)
{ {
player->GetSession()->SendDoFlight(6376, 880); pPlayer->GetSession()->SendDoFlight(6376, 880);
} }
return true; return true;
src/bindings/scripts/scripts/custom/test.cpp
+14 -14
View File
@@ -147,41 +147,41 @@ CreatureAI* GetAI_test(Creature *_Creature)
return (CreatureAI*)testAI; return (CreatureAI*)testAI;
} }
bool GossipHello_npc_test(Player *player, Creature *_Creature) bool GossipHello_npc_test(Player* pPlayer, Creature *_Creature)
{ {
player->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID()); pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
_Creature->prepareGossipMenu(player,0); _Creature->prepareGossipMenu(pPlayer,0);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(Attack, Defend, Run)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(Attack, Defend, Run)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, NoDefend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, NoDefend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, Defend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Click to Test Escort(NoAttack, Defend, Walk)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
_Creature->sendPreparedGossip( player ); _Creature->sendPreparedGossip(pPlayer);
return true; return true;
} }
bool GossipSelect_npc_test(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_test(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+1) if (action == GOSSIP_ACTION_INFO_DEF+1)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
((npc_escortAI*)(_Creature->AI()))->Start(true, true, player->GetGUID()); ((npc_escortAI*)(_Creature->AI()))->Start(true, true, pPlayer->GetGUID());
return true; // prevent Trinity core handling return true; // prevent Trinity core handling
} }
if (action == GOSSIP_ACTION_INFO_DEF+2) if (action == GOSSIP_ACTION_INFO_DEF+2)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
((npc_escortAI*)(_Creature->AI()))->Start(false, false, player->GetGUID()); ((npc_escortAI*)(_Creature->AI()))->Start(false, false, pPlayer->GetGUID());
return true; // prevent Trinity core handling return true; // prevent Trinity core handling
} }
if (action == GOSSIP_ACTION_INFO_DEF+3) if (action == GOSSIP_ACTION_INFO_DEF+3)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
((npc_escortAI*)(_Creature->AI()))->Start(false, false, player->GetGUID()); ((npc_escortAI*)(_Creature->AI()))->Start(false, false, pPlayer->GetGUID());
return true; // prevent Trinity core handling return true; // prevent Trinity core handling
} }
src/bindings/scripts/scripts/examples/example_creature.cpp
+9 -9
View File
@@ -192,7 +192,7 @@ struct TRINITY_DLL_DECL example_creatureAI : public ScriptedAI
} }
//Our Recive emote function //Our Recive emote function
void ReceiveEmote(Player *player, uint32 emote) void ReceiveEmote(Player* pPlayer, uint32 emote)
{ {
m_creature->HandleEmoteCommand(emote); m_creature->HandleEmoteCommand(emote);
@@ -212,31 +212,31 @@ CreatureAI* GetAI_example_creature(Creature *_Creature)
} }
//This function is called when the player clicks an option on the gossip menu //This function is called when the player clicks an option on the gossip menu
void SendDefaultMenu_example_creature(Player *player, Creature *_Creature, uint32 action) void SendDefaultMenu_example_creature(Player* pPlayer, Creature *_Creature, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
{ {
//Set our faction to hostile twoards all //Set our faction to hostile twoards all
_Creature->setFaction(24); _Creature->setFaction(24);
_Creature->Attack(player, true); _Creature->Attack(pPlayer, true);
player->PlayerTalkClass->CloseGossip(); pPlayer->PlayerTalkClass->CloseGossip();
} }
} }
//This function is called when the player clicks an option on the gossip menu //This function is called when the player clicks an option on the gossip menu
bool GossipSelect_example_creature(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_example_creature(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (sender == GOSSIP_SENDER_MAIN) if (sender == GOSSIP_SENDER_MAIN)
SendDefaultMenu_example_creature(player, _Creature, action); SendDefaultMenu_example_creature(pPlayer, _Creature, action);
return true; return true;
} }
//This function is called when the player opens the gossip menu //This function is called when the player opens the gossip menu
bool GossipHello_example_creature(Player *player, Creature *_Creature) bool GossipHello_example_creature(Player* pPlayer, Creature *_Creature)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
return true; return true;
} }
src/bindings/scripts/scripts/examples/example_escort.cpp
+14 -14
View File
@@ -168,41 +168,41 @@ CreatureAI* GetAI_example_escort(Creature *_Creature)
return testAI; return testAI;
} }
bool GossipHello_example_escort(Player *player, Creature *_Creature) bool GossipHello_example_escort(Player* pPlayer, Creature *_Creature)
{ {
player->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID()); pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
_Creature->prepareGossipMenu(player,0); _Creature->prepareGossipMenu(pPlayer,0);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
_Creature->sendPreparedGossip( player ); _Creature->sendPreparedGossip(pPlayer);
return true; return true;
} }
bool GossipSelect_example_escort(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_example_escort(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+1) if (action == GOSSIP_ACTION_INFO_DEF+1)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, true, player->GetGUID()); CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, true, pPlayer->GetGUID());
return true; // prevent mangos core handling return true; // prevent mangos core handling
} }
if (action == GOSSIP_ACTION_INFO_DEF+2) if (action == GOSSIP_ACTION_INFO_DEF+2)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, false, player->GetGUID()); CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, false, pPlayer->GetGUID());
return true; // prevent mangos core handling return true; // prevent mangos core handling
} }
if (action == GOSSIP_ACTION_INFO_DEF+3) if (action == GOSSIP_ACTION_INFO_DEF+3)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, player->GetGUID()); CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID());
return true; // prevent mangos core handling return true; // prevent mangos core handling
} }
src/bindings/scripts/scripts/examples/example_gossip_codebox.cpp
+11 -11
View File
@@ -32,43 +32,43 @@ EndScriptData */
#define GOSSIP_ITEM_2 "I'm not interested" #define GOSSIP_ITEM_2 "I'm not interested"
//This function is called when the player opens the gossip menubool //This function is called when the player opens the gossip menubool
bool GossipHello_example_gossip_codebox(Player *player, Creature *_Creature) bool GossipHello_example_gossip_codebox(Player* pPlayer, Creature *_Creature)
{ {
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true); pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1, "", 0, true);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID()); pPlayer->PlayerTalkClass->SendGossipMenu(907,_Creature->GetGUID());
return true; return true;
} }
//This function is called when the player clicks an option on the gossip menubool //This function is called when the player clicks an option on the gossip menubool
bool GossipSelect_example_gossip_codebox(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_example_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+2) if (action == GOSSIP_ACTION_INFO_DEF+2)
{ {
DoScriptText(SAY_NOT_INTERESTED, _Creature); DoScriptText(SAY_NOT_INTERESTED, _Creature);
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
} }
return true; return true;
} }
bool GossipSelectWithCode_example_gossip_codebox( Player *player, Creature *_Creature, uint32 sender, uint32 action, const char* sCode ) bool GossipSelectWithCode_example_gossip_codebox(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action, const char* sCode)
{ {
if (sender == GOSSIP_SENDER_MAIN) if (sender == GOSSIP_SENDER_MAIN)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+1) if (action == GOSSIP_ACTION_INFO_DEF+1)
{ {
if(std::strcmp(sCode, player->GetName())!=0) if (std::strcmp(sCode, pPlayer->GetName())!=0)
{ {
DoScriptText(SAY_WRONG, _Creature); DoScriptText(SAY_WRONG, _Creature);
_Creature->CastSpell(player, 12826, true); _Creature->CastSpell(pPlayer, 12826, true);
} }
else else
{ {
DoScriptText(SAY_CORRECT, _Creature); DoScriptText(SAY_CORRECT, _Creature);
_Creature->CastSpell(player, 26990, true); _Creature->CastSpell(pPlayer, 26990, true);
} }
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
return true; return true;
} }
} }
src/bindings/scripts/scripts/examples/example_misc.cpp
+5 -5
View File
@@ -25,22 +25,22 @@ EndScriptData */
#define SAY_HI -1999925 #define SAY_HI -1999925
bool AT_example_areatrigger(Player *player, AreaTriggerEntry *at) bool AT_example_areatrigger(Player* pPlayer, AreaTriggerEntry *at)
{ {
DoScriptText(SAY_HI, player); DoScriptText(SAY_HI, pPlayer);
return true; return true;
} }
extern void LoadDatabase(); extern void LoadDatabase();
bool ItemUse_example_item(Player *player, Item* _Item, SpellCastTargets const& targets) bool ItemUse_example_item(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
{ {
LoadDatabase(); LoadDatabase();
return true; return true;
} }
bool GOHello_example_go_teleporter(Player *player, GameObject* _GO) bool GOHello_example_go_teleporter(Player* pPlayer, GameObject* _GO)
{ {
player->TeleportTo(0, 1807.07f,336.105f,70.3975f,0.0f); pPlayer->TeleportTo(0, 1807.07f,336.105f,70.3975f,0.0f);
return false; return false;
} }
src/bindings/scripts/scripts/go/go_scripts.cpp
+35 -35
View File
@@ -51,9 +51,9 @@ enum
SPELL_SUMMON_GHOST_SABER = 5968, SPELL_SUMMON_GHOST_SABER = 5968,
}; };
bool GOHello_go_cat_figurine(Player *player, GameObject* _GO) bool GOHello_go_cat_figurine(Player* pPlayer, GameObject* _GO)
{ {
player->CastSpell(player,SPELL_SUMMON_GHOST_SABER,true); pPlayer->CastSpell(pPlayer,SPELL_SUMMON_GHOST_SABER,true);
return false; return false;
} }
@@ -61,44 +61,44 @@ bool GOHello_go_cat_figurine(Player *player, GameObject* _GO)
## go_crystal_pylons (3x) ## go_crystal_pylons (3x)
######*/ ######*/
bool GOHello_go_northern_crystal_pylon(Player *player, GameObject* _GO) bool GOHello_go_northern_crystal_pylon(Player* pPlayer, GameObject* _GO)
{ {
if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
{ {
player->PrepareQuestMenu(_GO->GetGUID()); pPlayer->PrepareQuestMenu(_GO->GetGUID());
player->SendPreparedQuest(_GO->GetGUID()); pPlayer->SendPreparedQuest(_GO->GetGUID());
} }
if (player->GetQuestStatus(4285) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(4285) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(4285); pPlayer->AreaExploredOrEventHappens(4285);
return true; return true;
} }
bool GOHello_go_eastern_crystal_pylon(Player *player, GameObject* _GO) bool GOHello_go_eastern_crystal_pylon(Player* pPlayer, GameObject* _GO)
{ {
if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
{ {
player->PrepareQuestMenu(_GO->GetGUID()); pPlayer->PrepareQuestMenu(_GO->GetGUID());
player->SendPreparedQuest(_GO->GetGUID()); pPlayer->SendPreparedQuest(_GO->GetGUID());
} }
if (player->GetQuestStatus(4287) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(4287) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(4287); pPlayer->AreaExploredOrEventHappens(4287);
return true; return true;
} }
bool GOHello_go_western_crystal_pylon(Player *player, GameObject* _GO) bool GOHello_go_western_crystal_pylon(Player* pPlayer, GameObject* _GO)
{ {
if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
{ {
player->PrepareQuestMenu(_GO->GetGUID()); pPlayer->PrepareQuestMenu(_GO->GetGUID());
player->SendPreparedQuest(_GO->GetGUID()); pPlayer->SendPreparedQuest(_GO->GetGUID());
} }
if (player->GetQuestStatus(4288) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(4288) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(4288); pPlayer->AreaExploredOrEventHappens(4288);
return true; return true;
} }
@@ -107,11 +107,11 @@ bool GOHello_go_western_crystal_pylon(Player *player, GameObject* _GO)
## go_barov_journal ## go_barov_journal
######*/ ######*/
bool GOHello_go_barov_journal(Player *player, GameObject* _GO) bool GOHello_go_barov_journal(Player* pPlayer, GameObject* _GO)
{ {
if(player->HasSkill(SKILL_TAILORING) && player->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !player->HasSpell(26086)) if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086))
{ {
player->CastSpell(player,26095,false); pPlayer->CastSpell(pPlayer,26095,false);
} }
return true; return true;
} }
@@ -120,11 +120,11 @@ bool GOHello_go_barov_journal(Player *player, GameObject* _GO)
## go_field_repair_bot_74A ## go_field_repair_bot_74A
######*/ ######*/
bool GOHello_go_field_repair_bot_74A(Player *player, GameObject* _GO) bool GOHello_go_field_repair_bot_74A(Player* pPlayer, GameObject* _GO)
{ {
if(player->HasSkill(SKILL_ENGINERING) && player->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !player->HasSpell(22704)) if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704))
{ {
player->CastSpell(player,22864,false); pPlayer->CastSpell(pPlayer,22864,false);
} }
return true; return true;
} }
@@ -153,10 +153,10 @@ bool GOHello_go_gilded_brazier(Player* pPlayer, GameObject* pGO)
## go_orb_of_command ## go_orb_of_command
######*/ ######*/
bool GOHello_go_orb_of_command(Player *player, GameObject* _GO) bool GOHello_go_orb_of_command(Player* pPlayer, GameObject* _GO)
{ {
if( player->GetQuestRewardStatus(7761) ) if (pPlayer->GetQuestRewardStatus(7761))
player->CastSpell(player,23460,true); pPlayer->CastSpell(pPlayer,23460,true);
return true; return true;
} }
@@ -165,11 +165,11 @@ bool GOHello_go_orb_of_command(Player *player, GameObject* _GO)
## go_tablet_of_madness ## go_tablet_of_madness
######*/ ######*/
bool GOHello_go_tablet_of_madness(Player *player, GameObject* _GO) bool GOHello_go_tablet_of_madness(Player* pPlayer, GameObject* _GO)
{ {
if (player->HasSkill(SKILL_ALCHEMY) && player->GetSkillValue(SKILL_ALCHEMY) >= 300 && !player->HasSpell(24266)) if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266))
{ {
player->CastSpell(player,24267,false); pPlayer->CastSpell(pPlayer,24267,false);
} }
return true; return true;
} }
@@ -179,13 +179,13 @@ bool GOHello_go_tablet_of_madness(Player *player, GameObject* _GO)
######*/ ######*/
//TODO: use gossip option ("Transcript the Tablet") instead, if Trinity adds support. //TODO: use gossip option ("Transcript the Tablet") instead, if Trinity adds support.
bool GOHello_go_tablet_of_the_seven(Player *player, GameObject* _GO) bool GOHello_go_tablet_of_the_seven(Player* pPlayer, GameObject* _GO)
{ {
if (_GO->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER) if (_GO->GetGoType() != GAMEOBJECT_TYPE_QUESTGIVER)
return true; return true;
if (player->GetQuestStatus(4296) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(4296) == QUEST_STATUS_INCOMPLETE)
player->CastSpell(player,15065,false); pPlayer->CastSpell(pPlayer,15065,false);
return true; return true;
} }
@@ -194,10 +194,10 @@ bool GOHello_go_tablet_of_the_seven(Player *player, GameObject* _GO)
## go_jump_a_tron ## go_jump_a_tron
######*/ ######*/
bool GOHello_go_jump_a_tron(Player *player, GameObject* _GO) bool GOHello_go_jump_a_tron(Player* pPlayer, GameObject* _GO)
{ {
if (player->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE)
player->CastSpell(player,33382,true); pPlayer->CastSpell(pPlayer,33382,true);
return true; return true;
} }
src/bindings/scripts/scripts/guard/guard_ai.cpp
+4 -4
View File
@@ -183,14 +183,14 @@ void guardAI::DoReplyToTextEmote(uint32 em)
} }
} }
void guardAI_orgrimmar::ReceiveEmote(Player *player, uint32 text_emote) void guardAI_orgrimmar::ReceiveEmote(Player* pPlayer, uint32 text_emote)
{ {
if (player->GetTeam()==HORDE) if (pPlayer->GetTeam()==HORDE)
DoReplyToTextEmote(text_emote); DoReplyToTextEmote(text_emote);
} }
void guardAI_stormwind::ReceiveEmote(Player *player, uint32 text_emote) void guardAI_stormwind::ReceiveEmote(Player* pPlayer, uint32 text_emote)
{ {
if (player->GetTeam() == ALLIANCE) if (pPlayer->GetTeam() == ALLIANCE)
DoReplyToTextEmote(text_emote); DoReplyToTextEmote(text_emote);
} }
src/bindings/scripts/scripts/guard/guards.cpp
+1741 -1741
View File
File diff suppressed because it is too large Load Diff
src/bindings/scripts/scripts/item/item_scripts.cpp
+34 -34
View File
@@ -41,7 +41,7 @@ enum
SPELL_ARCANE_CHARGES = 45072 SPELL_ARCANE_CHARGES = 45072
}; };
bool ItemUse_item_only_for_flight(Player *player, Item* _Item, SpellCastTargets const& targets) bool ItemUse_item_only_for_flight(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
{ {
uint32 itemId = _Item->GetEntry(); uint32 itemId = _Item->GetEntry();
bool disabled = false; bool disabled = false;
@@ -50,25 +50,25 @@ bool ItemUse_item_only_for_flight(Player *player, Item* _Item, SpellCastTargets
switch(itemId) switch(itemId)
{ {
case 24538: case 24538:
if(player->GetAreaId() != 3628) if (pPlayer->GetAreaId() != 3628)
disabled = true; disabled = true;
break; break;
case 34489: case 34489:
if(player->GetZoneId() != 4080) if (pPlayer->GetZoneId() != 4080)
disabled = true; disabled = true;
break; break;
case 34475: case 34475:
if (const SpellEntry* pSpellInfo = GetSpellStore()->LookupEntry(SPELL_ARCANE_CHARGES)) if (const SpellEntry* pSpellInfo = GetSpellStore()->LookupEntry(SPELL_ARCANE_CHARGES))
Spell::SendCastResult(player, pSpellInfo, 1, SPELL_FAILED_NOT_ON_GROUND); Spell::SendCastResult(pPlayer, pSpellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
break; break;
} }
// allow use in flight only // allow use in flight only
if( player->isInFlight() && !disabled) if (pPlayer->isInFlight() && !disabled)
return false; return false;
// error // error
player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL); pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL);
return true; return true;
} }
@@ -78,30 +78,30 @@ bool ItemUse_item_only_for_flight(Player *player, Item* _Item, SpellCastTargets
//This is just a hack and should be removed from here. //This is just a hack and should be removed from here.
//Creature/Item are in fact created before spell are sucessfully casted, without any checks at all to ensure proper/expected behavior. //Creature/Item are in fact created before spell are sucessfully casted, without any checks at all to ensure proper/expected behavior.
bool ItemUse_item_draenei_fishing_net(Player *player, Item* _Item, SpellCastTargets const& targets) bool ItemUse_item_draenei_fishing_net(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
{ {
//if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT && //if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId() == TYPEID_GAMEOBJECT &&
//targets.getGOTarget()->GetGOInfo()->type == GAMEOBJECT_TYPE_SPELL_FOCUS && targets.getGOTarget()->GetEntry() == 181616) //targets.getGOTarget()->GetGOInfo()->type == GAMEOBJECT_TYPE_SPELL_FOCUS && targets.getGOTarget()->GetEntry() == 181616)
//{ //{
if( player->GetQuestStatus(9452) == QUEST_STATUS_INCOMPLETE ) if (pPlayer->GetQuestStatus(9452) == QUEST_STATUS_INCOMPLETE)
{ {
if (rand()%100 < 35) if (rand()%100 < 35)
{ {
Creature *Murloc = player->SummonCreature(17102,player->GetPositionX() ,player->GetPositionY()+20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); Creature *Murloc = pPlayer->SummonCreature(17102,pPlayer->GetPositionX() ,pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000);
if (Murloc) if (Murloc)
Murloc->AI()->AttackStart(player); Murloc->AI()->AttackStart(pPlayer);
} }
else else
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 23614, 1); uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 23614, 1);
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
{ {
Item* item = player->StoreNewItem(dest,23614,true); Item* item = pPlayer->StoreNewItem(dest,23614,true);
if (item) if (item)
player->SendNewItem(item,1,false,true); pPlayer->SendNewItem(item,1,false,true);
}else }else
player->SendEquipError(msg,NULL,NULL); pPlayer->SendEquipError(msg,NULL,NULL);
} }
} }
//} //}
@@ -112,15 +112,15 @@ bool ItemUse_item_draenei_fishing_net(Player *player, Item* _Item, SpellCastTarg
# item_nether_wraith_beacon # item_nether_wraith_beacon
#####*/ #####*/
bool ItemUse_item_nether_wraith_beacon(Player *player, Item* _Item, SpellCastTargets const& targets) bool ItemUse_item_nether_wraith_beacon(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
{ {
if (player->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10832) == QUEST_STATUS_INCOMPLETE)
{ {
Creature *Nether; Creature *Nether;
Nether = player->SummonCreature(22408,player->GetPositionX() ,player->GetPositionY()+20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000); Nether = pPlayer->SummonCreature(22408,pPlayer->GetPositionX() ,pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
Nether = player->SummonCreature(22408,player->GetPositionX() ,player->GetPositionY()-20, player->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000); Nether = pPlayer->SummonCreature(22408,pPlayer->GetPositionX() ,pPlayer->GetPositionY()-20, pPlayer->GetPositionZ(), 0,TEMPSUMMON_TIMED_DESPAWN,180000);
if (Nether) if (Nether)
(Nether->AI())->AttackStart(player); (Nether->AI())->AttackStart(pPlayer);
} }
return false; return false;
} }
@@ -129,19 +129,19 @@ bool ItemUse_item_nether_wraith_beacon(Player *player, Item* _Item, SpellCastTar
# item_flying_machine # item_flying_machine
#####*/ #####*/
bool ItemUse_item_flying_machine(Player *player, Item* _Item, SpellCastTargets const& targets) bool ItemUse_item_flying_machine(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
{ {
uint32 itemId = _Item->GetEntry(); uint32 itemId = _Item->GetEntry();
if (itemId == 34060) if (itemId == 34060)
if( player->GetBaseSkillValue(SKILL_RIDING) >= 225 ) if (pPlayer->GetBaseSkillValue(SKILL_RIDING) >= 225)
return false; return false;
if (itemId == 34061) if (itemId == 34061)
if( player->GetBaseSkillValue(SKILL_RIDING) == 300 ) if (pPlayer->GetBaseSkillValue(SKILL_RIDING) == 300)
return false; return false;
debug_log("TSCR: Player attempt to use item %u, but did not meet riding requirement",itemId); debug_log("TSCR: Player attempt to use item %u, but did not meet riding requirement",itemId);
player->SendEquipError(EQUIP_ERR_ERR_CANT_EQUIP_SKILL,_Item,NULL); pPlayer->SendEquipError(EQUIP_ERR_ERR_CANT_EQUIP_SKILL,_Item,NULL);
return true; return true;
} }
@@ -149,13 +149,13 @@ bool ItemUse_item_flying_machine(Player *player, Item* _Item, SpellCastTargets c
# item_gor_dreks_ointment # item_gor_dreks_ointment
#####*/ #####*/
bool ItemUse_item_gor_dreks_ointment(Player *player, Item* _Item, SpellCastTargets const& targets) bool ItemUse_item_gor_dreks_ointment(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
{ {
if (targets.getUnitTarget() && targets.getUnitTarget()->GetTypeId()==TYPEID_UNIT && if (targets.getUnitTarget() && targets.getUnitTarget()->GetTypeId()==TYPEID_UNIT &&
targets.getUnitTarget()->GetEntry() == 20748 && !targets.getUnitTarget()->HasAura(32578)) targets.getUnitTarget()->GetEntry() == 20748 && !targets.getUnitTarget()->HasAura(32578))
return false; return false;
player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL); pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL);
return true; return true;
} }
@@ -163,15 +163,15 @@ bool ItemUse_item_gor_dreks_ointment(Player *player, Item* _Item, SpellCastTarge
# item_incendiary_explosives # item_incendiary_explosives
#####*/ #####*/
bool ItemUse_item_incendiary_explosives(Player *player, Item* _Item, SpellCastTargets const& targets) bool ItemUse_item_incendiary_explosives(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
{ {
if ( player->FindNearestCreature(26248,15) || player->FindNearestCreature(26249,15) ) if (pPlayer->FindNearestCreature(26248,15) || pPlayer->FindNearestCreature(26249,15))
{ {
return false; return false;
} }
else else
{ {
player->SendEquipError(EQUIP_ERR_OUT_OF_RANGE,_Item,NULL); pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE,_Item,NULL);
return true; return true;
} }
} }
@@ -180,13 +180,13 @@ bool ItemUse_item_incendiary_explosives(Player *player, Item* _Item, SpellCastTa
# item_mysterious_egg # item_mysterious_egg
#####*/ #####*/
bool ItemExpire_item_mysterious_egg(Player *player, ItemPrototype const * _ItemProto) bool ItemExpire_item_mysterious_egg(Player* pPlayer, ItemPrototype const * _ItemProto)
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 39883, 1); // Cracked Egg
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
{ {
player->StoreNewItem( dest, 39883, true, Item::GenerateItemRandomPropertyId(39883)); pPlayer->StoreNewItem(dest, 39883, true, Item::GenerateItemRandomPropertyId(39883));
} }
return true; return true;
} }
@@ -195,13 +195,13 @@ bool ItemExpire_item_mysterious_egg(Player *player, ItemPrototype const * _ItemP
# item_disgusting_jar # item_disgusting_jar
#####*/ #####*/
bool ItemExpire_item_disgusting_jar(Player *player, ItemPrototype const * _ItemProto) bool ItemExpire_item_disgusting_jar(Player* pPlayer, ItemPrototype const * _ItemProto)
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 44718, 1); // Ripe Disgusting Jar
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
{ {
player->StoreNewItem( dest, 44718, true, Item::GenerateItemRandomPropertyId(44718)); pPlayer->StoreNewItem(dest, 44718, true, Item::GenerateItemRandomPropertyId(44718));
} }
return true; return true;
} }
src/bindings/scripts/scripts/item/item_test.cpp
+1 -1
View File
@@ -25,7 +25,7 @@ EndScriptData */
extern void LoadDatabase(); extern void LoadDatabase();
bool ItemUse_item_test(Player *player, Item* _Item, SpellCastTargets const& targets) bool ItemUse_item_test(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
{ {
LoadDatabase(); LoadDatabase();
return true; return true;
src/bindings/scripts/scripts/npc/npc_innkeeper.cpp
+13 -13
View File
@@ -47,15 +47,15 @@ bool isEventActive()
return false; return false;
} }
bool GossipHello_npc_innkeeper(Player *player, Creature *_Creature) bool GossipHello_npc_innkeeper(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (isEventActive()&& !player->GetAura(SPELL_TRICK_OR_TREATED, player->GetGUID())) if (isEventActive()&& !pPlayer->GetAura(SPELL_TRICK_OR_TREATED, pPlayer->GetGUID()))
{ {
char* localizedEntry; char* localizedEntry;
switch (player->GetSession()->GetSessionDbLocaleIndex()) switch (pPlayer->GetSession()->GetSessionDbLocaleIndex())
{ {
case 0: case 0:
localizedEntry=LOCALE_TRICK_OR_TREAT_0; localizedEntry=LOCALE_TRICK_OR_TREAT_0;
@@ -73,25 +73,25 @@ bool GossipHello_npc_innkeeper(Player *player, Creature *_Creature)
localizedEntry=LOCALE_TRICK_OR_TREAT_0; localizedEntry=LOCALE_TRICK_OR_TREAT_0;
} }
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, localizedEntry, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID);
} }
player->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID()); pPlayer->TalkedToCreature(_Creature->GetEntry(),_Creature->GetGUID());
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_innkeeper(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_innkeeper(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && isEventActive() && !player->GetAura(SPELL_TRICK_OR_TREATED, player->GetGUID())) if (action == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && isEventActive() && !pPlayer->GetAura(SPELL_TRICK_OR_TREATED, pPlayer->GetGUID()))
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player, SPELL_TRICK_OR_TREATED, true); pPlayer->CastSpell(pPlayer, SPELL_TRICK_OR_TREATED, true);
// either trick or treat, 50% chance // either trick or treat, 50% chance
if (rand()%2) if (rand()%2)
{ {
player->CastSpell(player, SPELL_TREAT, true); pPlayer->CastSpell(pPlayer, SPELL_TREAT, true);
} }
else else
{ {
@@ -126,7 +126,7 @@ bool GossipSelect_npc_innkeeper(Player *player, Creature *_Creature, uint32 send
trickspell=24723; // skeleton costume trickspell=24723; // skeleton costume
break; break;
} }
player->CastSpell(player, trickspell, true); pPlayer->CastSpell(pPlayer, trickspell, true);
} }
return true; // prevent Trinity core handling return true; // prevent Trinity core handling
} }
src/bindings/scripts/scripts/npc/npc_professions.cpp
+396 -396
View File
File diff suppressed because it is too large Load Diff
src/bindings/scripts/scripts/npc/npc_taxi.cpp
+102 -102
View File
@@ -24,226 +24,226 @@ EndScriptData
#include "precompiled.h" #include "precompiled.h"
bool GossipHello_npc_taxi(Player *player, Creature *_Creature) bool GossipHello_npc_taxi(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
switch(_Creature->GetEntry()) { switch(_Creature->GetEntry()) {
case 17435: // Azuremyst Isle - Susurrus case 17435: // Azuremyst Isle - Susurrus
if (player->HasItemCount(23843,1,true)) if (pPlayer->HasItemCount(23843,1,true))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
break; break;
case 20903: // Netherstorm - Protectorate Nether Drake case 20903: // Netherstorm - Protectorate Nether Drake
if(player->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && player->HasItemCount(29778,1)) if (pPlayer->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(29778,1))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'm ready to fly! Take me up, dragon!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'm ready to fly! Take me up, dragon!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
break; break;
case 18725: // Old Hillsbrad Foothills - Brazen case 18725: // Old Hillsbrad Foothills - Brazen
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready to go to Durnholde Keep.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready to go to Durnholde Keep.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
break; break;
case 29154: // Stormwind City - Thargold Ironwing case 29154: // Stormwind City - Thargold Ironwing
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'd like to take a flight around Stormwind Harbor.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I'd like to take a flight around Stormwind Harbor.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
break; break;
case 19409: // Hellfire Peninsula - Wing Commander Dabir'ee case 19409: // Hellfire Peninsula - Wing Commander Dabir'ee
//Mission: The Murketh and Shaadraz Gateways //Mission: The Murketh and Shaadraz Gateways
if (player->GetQuestStatus(10146) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10146) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Murketh and Shaadraz Gateways", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Murketh and Shaadraz Gateways", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
//Shatter Point //Shatter Point
if (!player->GetQuestRewardStatus(10340)) if (!pPlayer->GetQuestRewardStatus(10340))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Shatter Point", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Shatter Point", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
break; break;
case 20235: // Hellfire Peninsula - Gryphoneer Windbellow case 20235: // Hellfire Peninsula - Gryphoneer Windbellow
//Mission: The Abyssal Shelf || Return to the Abyssal Shelf //Mission: The Abyssal Shelf || Return to the Abyssal Shelf
if (player->GetQuestStatus(10163) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10346) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10163) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10346) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to The Abyssal Shelf", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to The Abyssal Shelf", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
//Go to the Front //Go to the Front
if (player->GetQuestStatus(10382) != QUEST_STATUS_NONE && !player->GetQuestRewardStatus(10382)) if (pPlayer->GetQuestStatus(10382) != QUEST_STATUS_NONE && !pPlayer->GetQuestRewardStatus(10382))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Honor Point", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Honor Point", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
break; break;
case 19401: // Hellfire Peninsula - Wing Commander Brack case 19401: // Hellfire Peninsula - Wing Commander Brack
//Mission: The Murketh and Shaadraz Gateways //Mission: The Murketh and Shaadraz Gateways
if (player->GetQuestStatus(10129) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10129) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Murketh and Shaadraz Gateways", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Murketh and Shaadraz Gateways", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
//Mission: The Abyssal Shelf || Return to the Abyssal Shelf //Mission: The Abyssal Shelf || Return to the Abyssal Shelf
if (player->GetQuestStatus(10162) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10347) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10162) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10347) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to The Abyssal Shelf", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to The Abyssal Shelf", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
//Spinebreaker Post //Spinebreaker Post
if (player->GetQuestStatus(10242) == QUEST_STATUS_COMPLETE && !player->GetQuestRewardStatus(10242)) if (pPlayer->GetQuestStatus(10242) == QUEST_STATUS_COMPLETE && !pPlayer->GetQuestRewardStatus(10242))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Spinebreaker Post", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Spinebreaker Post", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
break; break;
case 23413: // Blade's Edge Mountains - Skyguard Handler Irena case 23413: // Blade's Edge Mountains - Skyguard Handler Irena
if (player->GetReputationRank(1031) >= REP_HONORED) if (pPlayer->GetReputationRank(1031) >= REP_HONORED)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Skettis please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Skettis please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
break; break;
case 25059: // Isle of Quel'Danas - Ayren Cloudbreaker case 25059: // Isle of Quel'Danas - Ayren Cloudbreaker
if (player->GetQuestStatus(11532) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(11533) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(11532) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(11533) == QUEST_STATUS_INCOMPLETE)
player->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 action, I've been ordered to undertake an air strike.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
if (player->GetQuestStatus(11542) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(11543) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(11542) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(11543) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to intercept the Dawnblade reinforcements.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to intercept the Dawnblade reinforcements.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
break; break;
case 25236: // Isle of Quel'Danas - Unrestrained Dragonhawk case 25236: // Isle of Quel'Danas - Unrestrained Dragonhawk
if (player->GetQuestStatus(11542) == QUEST_STATUS_COMPLETE || player->GetQuestStatus(11543) == QUEST_STATUS_COMPLETE) if (pPlayer->GetQuestStatus(11542) == QUEST_STATUS_COMPLETE || pPlayer->GetQuestStatus(11543) == QUEST_STATUS_COMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "<Ride the dragonhawk to Sun's Reach>", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "<Ride the dragonhawk to Sun's Reach>", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
break; break;
case 20162: // Netherstorm - Veronia case 20162: // Netherstorm - Veronia
//Behind Enemy Lines //Behind Enemy Lines
if (player->GetQuestStatus(10652) && !player->GetQuestRewardStatus(10652)) if (pPlayer->GetQuestStatus(10652) && !pPlayer->GetQuestRewardStatus(10652))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Manaforge Coruu please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Manaforge Coruu please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15);
break; break;
case 23415: // Terokkar Forest - Skyguard Handler Deesak case 23415: // Terokkar Forest - Skyguard Handler Deesak
if (player->GetReputationRank(1031) >= REP_HONORED) if (pPlayer->GetReputationRank(1031) >= REP_HONORED)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Ogri'la please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 16); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Fly me to Ogri'la please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 16);
break; break;
case 27575: // Dragonblight - Lord Afrasastrasz case 27575: // Dragonblight - Lord Afrasastrasz
// middle -> ground // middle -> ground
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I would like to take a flight to the ground, Lord Of Afrasastrasz.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 17); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I would like to take a flight to the ground, Lord Of Afrasastrasz.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 17);
// middle -> top // middle -> top
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "My Lord, I must go to the upper floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 18); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "My Lord, I must go to the upper floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 18);
break; break;
case 26443: // Dragonblight - Tariolstrasz //need to check if quests are required before gossip available (12123, 12124) case 26443: // Dragonblight - Tariolstrasz //need to check if quests are required before gossip available (12123, 12124)
// ground -> top // ground -> top
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "My Lord, I must go to the upper floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 19); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "My Lord, I must go to the upper floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 19);
// ground -> middle // ground -> middle
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you spare a drake to travel to Lord Of Afrasastrasz, in the middle of the temple?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 20); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you spare a drake to travel to Lord Of Afrasastrasz, in the middle of the temple?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 20);
break; break;
case 26949: // Dragonblight - Torastrasza case 26949: // Dragonblight - Torastrasza
// top -> middle // top -> middle
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I would like to see Lord Of Afrasastrasz, in the middle of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I would like to see Lord Of Afrasastrasz, in the middle of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
// top -> ground // top -> ground
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes, Please. I would like to return to the ground floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes, Please. I would like to return to the ground floor of the temple.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
break; break;
case 23816: // Howling Fjord - Bat Handler Camille case 23816: // Howling Fjord - Bat Handler Camille
if (!player->GetQuestRewardStatus(11229)) if (!pPlayer->GetQuestRewardStatus(11229))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to fly to the Windrunner Official business!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to fly to the Windrunner Official business!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
if (player->GetQuestStatus(11170) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(11170) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to commandeer a riding bat for special assignment for us.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need to commandeer a riding bat for special assignment for us.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
break; break;
case 23704: // Dustwallow Marsh - Cassa Crimsonwing case 23704: // Dustwallow Marsh - Cassa Crimsonwing
if (player->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,"<Ride the gryphons to Survey Alcaz Island>",GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+25); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,"<Ride the gryphons to Survey Alcaz Island>",GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+25);
break; break;
} }
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_taxi(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_taxi(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch(action) { switch(action) {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
//spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506. //spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506.
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,32474,true); pPlayer->CastSpell(pPlayer,32474,true);
break; break;
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(627); //TaxiPath 627 (possibly 627+628(152->153->154->155) ) pPlayer->ActivateTaxiPathTo(627); //TaxiPath 627 (possibly 627+628(152->153->154->155))
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
if( !player->HasItemCount(25853,1) ) { if (!pPlayer->HasItemCount(25853,1)) {
player->SEND_GOSSIP_MENU(9780, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9780, _Creature->GetGUID());
} else { } else {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(534); //TaxiPath 534 pPlayer->ActivateTaxiPathTo(534); //TaxiPath 534
} }
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->GetSession()->SendDoFlight(1149, 1041); pPlayer->GetSession()->SendDoFlight(1149, 1041);
break; break;
case GOSSIP_ACTION_INFO_DEF + 4: case GOSSIP_ACTION_INFO_DEF + 4:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33768,true); //TaxiPath 585 (Gateways Murket and Shaadraz) pPlayer->CastSpell(pPlayer,33768,true); //TaxiPath 585 (Gateways Murket and Shaadraz)
break; break;
case GOSSIP_ACTION_INFO_DEF + 5: case GOSSIP_ACTION_INFO_DEF + 5:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,35069,true); //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point) pPlayer->CastSpell(pPlayer,35069,true); //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point)
break; break;
case GOSSIP_ACTION_INFO_DEF + 6: case GOSSIP_ACTION_INFO_DEF + 6:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33899,true); //TaxiPath 589 (Aerial Assault Flight (Alliance)) pPlayer->CastSpell(pPlayer,33899,true); //TaxiPath 589 (Aerial Assault Flight (Alliance))
break; break;
case GOSSIP_ACTION_INFO_DEF + 7: case GOSSIP_ACTION_INFO_DEF + 7:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,35065,true); //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head) pPlayer->CastSpell(pPlayer,35065,true); //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head)
break; break;
case GOSSIP_ACTION_INFO_DEF + 8: case GOSSIP_ACTION_INFO_DEF + 8:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33659,true); //TaxiPath 584 (Gateways Murket and Shaadraz) pPlayer->CastSpell(pPlayer,33659,true); //TaxiPath 584 (Gateways Murket and Shaadraz)
break; break;
case GOSSIP_ACTION_INFO_DEF + 9: case GOSSIP_ACTION_INFO_DEF + 9:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,33825,true); //TaxiPath 587 (Aerial Assault Flight (Horde)) pPlayer->CastSpell(pPlayer,33825,true); //TaxiPath 587 (Aerial Assault Flight (Horde))
break; break;
case GOSSIP_ACTION_INFO_DEF + 10: case GOSSIP_ACTION_INFO_DEF + 10:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,34578,true); //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge) pPlayer->CastSpell(pPlayer,34578,true); //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge)
break; break;
case GOSSIP_ACTION_INFO_DEF + 11: case GOSSIP_ACTION_INFO_DEF + 11:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,41278,true); //TaxiPath 706 pPlayer->CastSpell(pPlayer,41278,true); //TaxiPath 706
break; break;
case GOSSIP_ACTION_INFO_DEF + 12: case GOSSIP_ACTION_INFO_DEF + 12:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,45071,true); //TaxiPath 779 pPlayer->CastSpell(pPlayer,45071,true); //TaxiPath 779
break; break;
case GOSSIP_ACTION_INFO_DEF + 13: case GOSSIP_ACTION_INFO_DEF + 13:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,45113,true); //TaxiPath 784 pPlayer->CastSpell(pPlayer,45113,true); //TaxiPath 784
break; break;
case GOSSIP_ACTION_INFO_DEF + 14: case GOSSIP_ACTION_INFO_DEF + 14:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,45353,true); //TaxiPath 788 pPlayer->CastSpell(pPlayer,45353,true); //TaxiPath 788
break; break;
case GOSSIP_ACTION_INFO_DEF + 15: case GOSSIP_ACTION_INFO_DEF + 15:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,34905,true); //TaxiPath 606 pPlayer->CastSpell(pPlayer,34905,true); //TaxiPath 606
break; break;
case GOSSIP_ACTION_INFO_DEF + 16: case GOSSIP_ACTION_INFO_DEF + 16:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,41279,true); //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost) pPlayer->CastSpell(pPlayer,41279,true); //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost)
break; break;
case GOSSIP_ACTION_INFO_DEF + 17: case GOSSIP_ACTION_INFO_DEF + 17:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(882); pPlayer->ActivateTaxiPathTo(882);
break; break;
case GOSSIP_ACTION_INFO_DEF + 18: case GOSSIP_ACTION_INFO_DEF + 18:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(881); pPlayer->ActivateTaxiPathTo(881);
break; break;
case GOSSIP_ACTION_INFO_DEF + 19: case GOSSIP_ACTION_INFO_DEF + 19:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(878); pPlayer->ActivateTaxiPathTo(878);
break; break;
case GOSSIP_ACTION_INFO_DEF + 20: case GOSSIP_ACTION_INFO_DEF + 20:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(883); pPlayer->ActivateTaxiPathTo(883);
break; break;
case GOSSIP_ACTION_INFO_DEF + 21: case GOSSIP_ACTION_INFO_DEF + 21:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(880); pPlayer->ActivateTaxiPathTo(880);
break; break;
case GOSSIP_ACTION_INFO_DEF + 22: case GOSSIP_ACTION_INFO_DEF + 22:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(879); pPlayer->ActivateTaxiPathTo(879);
break; break;
case GOSSIP_ACTION_INFO_DEF + 23: case GOSSIP_ACTION_INFO_DEF + 23:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,43074,true); //TaxiPath 736 pPlayer->CastSpell(pPlayer,43074,true); //TaxiPath 736
break; break;
case GOSSIP_ACTION_INFO_DEF + 24: case GOSSIP_ACTION_INFO_DEF + 24:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(738); pPlayer->ActivateTaxiPathTo(738);
break; break;
case GOSSIP_ACTION_INFO_DEF + 25: case GOSSIP_ACTION_INFO_DEF + 25:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,42295,true); pPlayer->CastSpell(pPlayer,42295,true);
break; break;
} }
src/bindings/scripts/scripts/npc/npcs_special.cpp
+153 -153
View File
@@ -289,12 +289,12 @@ struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void ReceiveEmote( Player *player, uint32 emote ) void ReceiveEmote(Player* pPlayer, uint32 emote)
{ {
switch(emote) switch(emote)
{ {
case TEXTEMOTE_CHICKEN: case TEXTEMOTE_CHICKEN:
if( player->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand()%30 == 1 ) if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_NONE && rand()%30 == 1)
{ {
m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
m_creature->setFaction(FACTION_FRIENDLY); m_creature->setFaction(FACTION_FRIENDLY);
@@ -302,7 +302,7 @@ struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI
} }
break; break;
case TEXTEMOTE_CHEER: case TEXTEMOTE_CHEER:
if( player->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE ) if (pPlayer->GetQuestStatus(QUEST_CLUCK) == QUEST_STATUS_COMPLETE)
{ {
m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER);
m_creature->setFaction(FACTION_FRIENDLY); m_creature->setFaction(FACTION_FRIENDLY);
@@ -318,7 +318,7 @@ CreatureAI* GetAI_npc_chicken_cluck(Creature *_Creature)
return new npc_chicken_cluckAI(_Creature); return new npc_chicken_cluckAI(_Creature);
} }
bool QuestAccept_npc_chicken_cluck(Player *player, Creature *_Creature, const Quest *_Quest ) bool QuestAccept_npc_chicken_cluck(Player* pPlayer, Creature *_Creature, const Quest *_Quest)
{ {
if (_Quest->GetQuestId() == QUEST_CLUCK) if (_Quest->GetQuestId() == QUEST_CLUCK)
CAST_AI(npc_chicken_cluckAI, _Creature->AI())->Reset(); CAST_AI(npc_chicken_cluckAI, _Creature->AI())->Reset();
@@ -326,7 +326,7 @@ bool QuestAccept_npc_chicken_cluck(Player *player, Creature *_Creature, const Qu
return true; return true;
} }
bool QuestComplete_npc_chicken_cluck(Player *player, Creature *_Creature, const Quest *_Quest) bool QuestComplete_npc_chicken_cluck(Player* pPlayer, Creature *_Creature, const Quest *_Quest)
{ {
if (_Quest->GetQuestId() == QUEST_CLUCK) if (_Quest->GetQuestId() == QUEST_CLUCK)
CAST_AI(npc_chicken_cluckAI, _Creature->AI())->Reset(); CAST_AI(npc_chicken_cluckAI, _Creature->AI())->Reset();
@@ -379,11 +379,11 @@ struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI
void EnterCombat(Unit* who){} void EnterCombat(Unit* who){}
void ReceiveEmote( Player *player, uint32 emote ) void ReceiveEmote(Player* pPlayer, uint32 emote)
{ {
if (m_creature->IsWithinLOS(player->GetPositionX(),player->GetPositionY(),player->GetPositionZ()) && m_creature->IsWithinDistInMap(player,30.0f)) if (m_creature->IsWithinLOS(pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ()) && m_creature->IsWithinDistInMap(pPlayer,30.0f))
{ {
m_creature->SetInFront(player); m_creature->SetInFront(pPlayer);
active = false; active = false;
WorldPacket data; WorldPacket data;
@@ -397,8 +397,8 @@ struct TRINITY_DLL_DECL npc_dancing_flamesAI : public ScriptedAI
case TEXTEMOTE_JOKE: m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break; case TEXTEMOTE_JOKE: m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); break;
case TEXTEMOTE_DANCE: case TEXTEMOTE_DANCE:
{ {
if (!player->HasAura(SPELL_SEDUCTION)) if (!pPlayer->HasAura(SPELL_SEDUCTION))
m_creature->CastSpell(player,SPELL_SEDUCTION,true); m_creature->CastSpell(pPlayer,SPELL_SEDUCTION,true);
} }
break; break;
} }
@@ -482,7 +482,7 @@ struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI
{ {
npc_doctorAI(Creature *c) : ScriptedAI(c) {} npc_doctorAI(Creature *c) : ScriptedAI(c) {}
uint64 Playerguid; uint64 PlayerGUID;
uint32 SummonPatient_Timer; uint32 SummonPatient_Timer;
uint32 SummonPatientCount; uint32 SummonPatientCount;
@@ -496,7 +496,7 @@ struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI
void Reset() void Reset()
{ {
Playerguid = 0; PlayerGUID = 0;
SummonPatient_Timer = 10000; SummonPatient_Timer = 10000;
SummonPatientCount = 0; SummonPatientCount = 0;
@@ -511,9 +511,9 @@ struct TRINITY_DLL_DECL npc_doctorAI : public ScriptedAI
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
} }
void BeginEvent(Player* player); void BeginEvent(Player* pPlayer);
void PatientDied(Location* Point); void PatientDied(Location* Point);
void PatientSaved(Creature* soldier, Player* player, Location* Point); void PatientSaved(Creature* soldier, Player* pPlayer, Location* Point);
void UpdateAI(const uint32 diff); void UpdateAI(const uint32 diff);
void EnterCombat(Unit* who){} void EnterCombat(Unit* who){}
@@ -646,9 +646,9 @@ CreatureAI* GetAI_npc_injured_patient(Creature *_Creature)
npc_doctor (continue) npc_doctor (continue)
*/ */
void npc_doctorAI::BeginEvent(Player* player) void npc_doctorAI::BeginEvent(Player* pPlayer)
{ {
Playerguid = player->GetGUID(); PlayerGUID = pPlayer->GetGUID();
SummonPatient_Timer = 10000; SummonPatient_Timer = 10000;
SummonPatientCount = 0; SummonPatientCount = 0;
@@ -673,17 +673,17 @@ void npc_doctorAI::BeginEvent(Player* player)
void npc_doctorAI::PatientDied(Location* Point) void npc_doctorAI::PatientDied(Location* Point)
{ {
Player* player = Unit::GetPlayer(Playerguid); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(player && ((player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE))) if (pPlayer && ((pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)))
{ {
++PatientDiedCount; ++PatientDiedCount;
if (PatientDiedCount > 5 && Event) if (PatientDiedCount > 5 && Event)
{ {
if(player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE)
player->FailQuest(6624); pPlayer->FailQuest(6624);
else if(player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE) else if (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)
player->FailQuest(6622); pPlayer->FailQuest(6622);
Reset(); Reset();
return; return;
@@ -696,11 +696,11 @@ void npc_doctorAI::PatientDied(Location* Point)
Reset(); Reset();
} }
void npc_doctorAI::PatientSaved(Creature* soldier, Player* player, Location* Point) void npc_doctorAI::PatientSaved(Creature* soldier, Player* pPlayer, Location* Point)
{ {
if (player && Playerguid == player->GetGUID()) if (pPlayer && PlayerGUID == pPlayer->GetGUID())
{ {
if ((player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)) if ((pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) || (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE))
{ {
++PatientSavedCount; ++PatientSavedCount;
@@ -716,10 +716,10 @@ void npc_doctorAI::PatientSaved(Creature* soldier, Player* player, Location* Poi
} }
} }
if (player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(6624); pPlayer->AreaExploredOrEventHappens(6624);
else if (player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE) else if (pPlayer->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(6622); pPlayer->AreaExploredOrEventHappens(6622);
Reset(); Reset();
return; return;
@@ -783,10 +783,10 @@ void npc_doctorAI::UpdateAI(const uint32 diff)
} }
} }
bool QuestAccept_npc_doctor(Player *player, Creature *creature, Quest const *quest ) bool QuestAccept_npc_doctor(Player* pPlayer, Creature *creature, Quest const *quest)
{ {
if ((quest->GetQuestId() == 6624) || (quest->GetQuestId() == 6622)) if ((quest->GetQuestId() == 6624) || (quest->GetQuestId() == 6622))
CAST_AI(npc_doctorAI, creature->AI())->BeginEvent(player); CAST_AI(npc_doctorAI, creature->AI())->BeginEvent(pPlayer);
return true; return true;
} }
@@ -1091,15 +1091,15 @@ bool GossipSelect_npc_kingdom_of_dalaran_quests(Player* pPlayer, Creature* pCrea
## npc_mount_vendor ## npc_mount_vendor
######*/ ######*/
bool GossipHello_npc_mount_vendor(Player *player, Creature *_Creature) bool GossipHello_npc_mount_vendor(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
bool canBuy; bool canBuy;
canBuy = false; canBuy = false;
uint32 vendor = _Creature->GetEntry(); uint32 vendor = _Creature->GetEntry();
uint8 race = player->getRace(); uint8 race = pPlayer->getRace();
switch (vendor) switch (vendor)
{ {
@@ -1107,53 +1107,53 @@ bool GossipHello_npc_mount_vendor(Player *player, Creature *_Creature)
case 1460: //Unger Statforth case 1460: //Unger Statforth
case 2357: //Merideth Carlson case 2357: //Merideth Carlson
case 4885: //Gregor MacVince case 4885: //Gregor MacVince
if (player->GetReputationRank(72) != REP_EXALTED && race != RACE_HUMAN) if (pPlayer->GetReputationRank(72) != REP_EXALTED && race != RACE_HUMAN)
player->SEND_GOSSIP_MENU(5855, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5855, _Creature->GetGUID());
else canBuy = true; else canBuy = true;
break; break;
case 1261: //Veron Amberstill case 1261: //Veron Amberstill
if (player->GetReputationRank(47) != REP_EXALTED && race != RACE_DWARF) if (pPlayer->GetReputationRank(47) != REP_EXALTED && race != RACE_DWARF)
player->SEND_GOSSIP_MENU(5856, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5856, _Creature->GetGUID());
else canBuy = true; else canBuy = true;
break; break;
case 3362: //Ogunaro Wolfrunner case 3362: //Ogunaro Wolfrunner
if (player->GetReputationRank(76) != REP_EXALTED && race != RACE_ORC) if (pPlayer->GetReputationRank(76) != REP_EXALTED && race != RACE_ORC)
player->SEND_GOSSIP_MENU(5841, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5841, _Creature->GetGUID());
else canBuy = true; else canBuy = true;
break; break;
case 3685: //Harb Clawhoof case 3685: //Harb Clawhoof
if (player->GetReputationRank(81) != REP_EXALTED && race != RACE_TAUREN) if (pPlayer->GetReputationRank(81) != REP_EXALTED && race != RACE_TAUREN)
player->SEND_GOSSIP_MENU(5843, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5843, _Creature->GetGUID());
else canBuy = true; else canBuy = true;
break; break;
case 4730: //Lelanai case 4730: //Lelanai
if (player->GetReputationRank(69) != REP_EXALTED && race != RACE_NIGHTELF) if (pPlayer->GetReputationRank(69) != REP_EXALTED && race != RACE_NIGHTELF)
player->SEND_GOSSIP_MENU(5844, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5844, _Creature->GetGUID());
else canBuy = true; else canBuy = true;
break; break;
case 4731: //Zachariah Post case 4731: //Zachariah Post
if (player->GetReputationRank(68) != REP_EXALTED && race != RACE_UNDEAD_PLAYER) if (pPlayer->GetReputationRank(68) != REP_EXALTED && race != RACE_UNDEAD_PLAYER)
player->SEND_GOSSIP_MENU(5840, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5840, _Creature->GetGUID());
else canBuy = true; else canBuy = true;
break; break;
case 7952: //Zjolnir case 7952: //Zjolnir
if (player->GetReputationRank(530) != REP_EXALTED && race != RACE_TROLL) if (pPlayer->GetReputationRank(530) != REP_EXALTED && race != RACE_TROLL)
player->SEND_GOSSIP_MENU(5842, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5842, _Creature->GetGUID());
else canBuy = true; else canBuy = true;
break; break;
case 7955: //Milli Featherwhistle case 7955: //Milli Featherwhistle
if (player->GetReputationRank(54) != REP_EXALTED && race != RACE_GNOME) if (pPlayer->GetReputationRank(54) != REP_EXALTED && race != RACE_GNOME)
player->SEND_GOSSIP_MENU(5857, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5857, _Creature->GetGUID());
else canBuy = true; else canBuy = true;
break; break;
case 16264: //Winaestra case 16264: //Winaestra
if (player->GetReputationRank(911) != REP_EXALTED && race != RACE_BLOODELF) if (pPlayer->GetReputationRank(911) != REP_EXALTED && race != RACE_BLOODELF)
player->SEND_GOSSIP_MENU(10305, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10305, _Creature->GetGUID());
else canBuy = true; else canBuy = true;
break; break;
case 17584: //Torallius the Pack Handler case 17584: //Torallius the Pack Handler
if (player->GetReputationRank(930) != REP_EXALTED && race != RACE_DRAENEI) if (pPlayer->GetReputationRank(930) != REP_EXALTED && race != RACE_DRAENEI)
player->SEND_GOSSIP_MENU(10239, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10239, _Creature->GetGUID());
else canBuy = true; else canBuy = true;
break; break;
} }
@@ -1161,16 +1161,16 @@ bool GossipHello_npc_mount_vendor(Player *player, Creature *_Creature)
if (canBuy) if (canBuy)
{ {
if (_Creature->isVendor()) if (_Creature->isVendor())
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
} }
return true; return true;
} }
bool GossipSelect_npc_mount_vendor(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_mount_vendor(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_TRADE) if (action == GOSSIP_ACTION_TRADE)
player->SEND_VENDORLIST( _Creature->GetGUID() ); pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
return true; return true;
} }
@@ -1179,41 +1179,41 @@ bool GossipSelect_npc_mount_vendor(Player *player, Creature *_Creature, uint32 s
## npc_rogue_trainer ## npc_rogue_trainer
######*/ ######*/
bool GossipHello_npc_rogue_trainer(Player *player, Creature *_Creature) bool GossipHello_npc_rogue_trainer(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (_Creature->isTrainer()) if (_Creature->isTrainer())
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN);
if( _Creature->isCanTrainingAndResetTalentsOf(player) ) if (_Creature->isCanTrainingAndResetTalentsOf(pPlayer))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "I wish to unlearn my talents", GOSSIP_SENDER_MAIN, GOSSIP_OPTION_UNLEARNTALENTS); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "I wish to unlearn my talents", GOSSIP_SENDER_MAIN, GOSSIP_OPTION_UNLEARNTALENTS);
if( player->getClass() == CLASS_ROGUE && player->getLevel() >= 24 && !player->HasItemCount(17126,1) && !player->GetQuestRewardStatus(6681) ) if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126,1) && !pPlayer->GetQuestRewardStatus(6681))
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "<Take the letter>", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "<Take the letter>", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(5996, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5996, _Creature->GetGUID());
} else } else
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_rogue_trainer(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_rogue_trainer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch(action) switch(action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,21100,false); pPlayer->CastSpell(pPlayer,21100,false);
break; break;
case GOSSIP_ACTION_TRAIN: case GOSSIP_ACTION_TRAIN:
player->SEND_TRAINERLIST( _Creature->GetGUID() ); pPlayer->SEND_TRAINERLIST(_Creature->GetGUID());
break; break;
case GOSSIP_OPTION_UNLEARNTALENTS: case GOSSIP_OPTION_UNLEARNTALENTS:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->SendTalentWipeConfirm( _Creature->GetGUID() ); pPlayer->SendTalentWipeConfirm(_Creature->GetGUID());
break; break;
} }
return true; return true;
@@ -1233,121 +1233,121 @@ bool GossipSelect_npc_rogue_trainer(Player *player, Creature *_Creature, uint32
#define SPELL_AGI 23736 //agi #define SPELL_AGI 23736 //agi
#define SPELL_FORTUNE 23765 //faire fortune #define SPELL_FORTUNE 23765 //faire fortune
bool GossipHello_npc_sayge(Player *player, Creature *_Creature) bool GossipHello_npc_sayge(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if( player->HasSpellCooldown(SPELL_INT) || if (pPlayer->HasSpellCooldown(SPELL_INT) ||
player->HasSpellCooldown(SPELL_ARM) || pPlayer->HasSpellCooldown(SPELL_ARM) ||
player->HasSpellCooldown(SPELL_DMG) || pPlayer->HasSpellCooldown(SPELL_DMG) ||
player->HasSpellCooldown(SPELL_RES) || pPlayer->HasSpellCooldown(SPELL_RES) ||
player->HasSpellCooldown(SPELL_STR) || pPlayer->HasSpellCooldown(SPELL_STR) ||
player->HasSpellCooldown(SPELL_AGI) || pPlayer->HasSpellCooldown(SPELL_AGI) ||
player->HasSpellCooldown(SPELL_STM) || pPlayer->HasSpellCooldown(SPELL_STM) ||
player->HasSpellCooldown(SPELL_SPI) ) pPlayer->HasSpellCooldown(SPELL_SPI))
player->SEND_GOSSIP_MENU(7393, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7393, _Creature->GetGUID());
else else
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(7339, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7339, _Creature->GetGUID());
} }
return true; return true;
} }
void SendAction_npc_sayge(Player *player, Creature *_Creature, uint32 action) void SendAction_npc_sayge(Player* pPlayer, Creature *_Creature, uint32 action)
{ {
switch(action) switch(action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Slay the Man", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Slay the Man", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Turn him over to liege", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Turn him over to liege", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confiscate the corn", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confiscate the corn", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let him go and have the corn", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let him go and have the corn", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
player->SEND_GOSSIP_MENU(7340, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7340, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painfully", GOSSIP_SENDER_MAIN+1, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painfully", GOSSIP_SENDER_MAIN+1, GOSSIP_ACTION_INFO_DEF);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painlessly", GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Execute your friend painlessly", GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let your friend go", GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let your friend go", GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(7341, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7341, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confront the diplomat", GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Confront the diplomat", GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Show not so quiet defiance", GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Show not so quiet defiance", GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Remain quiet", GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Remain quiet", GOSSIP_SENDER_MAIN+2, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(7361, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7361, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Speak against your brother openly", GOSSIP_SENDER_MAIN+6, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Speak against your brother openly", GOSSIP_SENDER_MAIN+6, GOSSIP_ACTION_INFO_DEF);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Help your brother in", GOSSIP_SENDER_MAIN+7, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Help your brother in", GOSSIP_SENDER_MAIN+7, GOSSIP_ACTION_INFO_DEF);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Keep your brother out without letting him know", GOSSIP_SENDER_MAIN+8, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Keep your brother out without letting him know", GOSSIP_SENDER_MAIN+8, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(7362, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7362, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, keep gold", GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, keep gold", GOSSIP_SENDER_MAIN+5, GOSSIP_ACTION_INFO_DEF);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, share the gold", GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Take credit, share the gold", GOSSIP_SENDER_MAIN+4, GOSSIP_ACTION_INFO_DEF);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let the knight take credit", GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Let the knight take credit", GOSSIP_SENDER_MAIN+3, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(7363, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7363, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thanks", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thanks", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
player->SEND_GOSSIP_MENU(7364, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7364, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
_Creature->CastSpell(player, SPELL_FORTUNE, false); _Creature->CastSpell(pPlayer, SPELL_FORTUNE, false);
player->SEND_GOSSIP_MENU(7365, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7365, _Creature->GetGUID());
break; break;
} }
} }
bool GossipSelect_npc_sayge(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_sayge(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch(sender) switch(sender)
{ {
case GOSSIP_SENDER_MAIN: case GOSSIP_SENDER_MAIN:
SendAction_npc_sayge(player, _Creature, action); SendAction_npc_sayge(pPlayer, _Creature, action);
break; break;
case GOSSIP_SENDER_MAIN+1: case GOSSIP_SENDER_MAIN+1:
_Creature->CastSpell(player, SPELL_DMG, false); _Creature->CastSpell(pPlayer, SPELL_DMG, false);
player->AddSpellCooldown(SPELL_DMG,0,time(NULL) + 7200); pPlayer->AddSpellCooldown(SPELL_DMG,0,time(NULL) + 7200);
SendAction_npc_sayge(player, _Creature, action); SendAction_npc_sayge(pPlayer, _Creature, action);
break; break;
case GOSSIP_SENDER_MAIN+2: case GOSSIP_SENDER_MAIN+2:
_Creature->CastSpell(player, SPELL_RES, false); _Creature->CastSpell(pPlayer, SPELL_RES, false);
player->AddSpellCooldown(SPELL_RES,0,time(NULL) + 7200); pPlayer->AddSpellCooldown(SPELL_RES,0,time(NULL) + 7200);
SendAction_npc_sayge(player, _Creature, action); SendAction_npc_sayge(pPlayer, _Creature, action);
break; break;
case GOSSIP_SENDER_MAIN+3: case GOSSIP_SENDER_MAIN+3:
_Creature->CastSpell(player, SPELL_ARM, false); _Creature->CastSpell(pPlayer, SPELL_ARM, false);
player->AddSpellCooldown(SPELL_ARM,0,time(NULL) + 7200); pPlayer->AddSpellCooldown(SPELL_ARM,0,time(NULL) + 7200);
SendAction_npc_sayge(player, _Creature, action); SendAction_npc_sayge(pPlayer, _Creature, action);
break; break;
case GOSSIP_SENDER_MAIN+4: case GOSSIP_SENDER_MAIN+4:
_Creature->CastSpell(player, SPELL_SPI, false); _Creature->CastSpell(pPlayer, SPELL_SPI, false);
player->AddSpellCooldown(SPELL_SPI,0,time(NULL) + 7200); pPlayer->AddSpellCooldown(SPELL_SPI,0,time(NULL) + 7200);
SendAction_npc_sayge(player, _Creature, action); SendAction_npc_sayge(pPlayer, _Creature, action);
break; break;
case GOSSIP_SENDER_MAIN+5: case GOSSIP_SENDER_MAIN+5:
_Creature->CastSpell(player, SPELL_INT, false); _Creature->CastSpell(pPlayer, SPELL_INT, false);
player->AddSpellCooldown(SPELL_INT,0,time(NULL) + 7200); pPlayer->AddSpellCooldown(SPELL_INT,0,time(NULL) + 7200);
SendAction_npc_sayge(player, _Creature, action); SendAction_npc_sayge(pPlayer, _Creature, action);
break; break;
case GOSSIP_SENDER_MAIN+6: case GOSSIP_SENDER_MAIN+6:
_Creature->CastSpell(player, SPELL_STM, false); _Creature->CastSpell(pPlayer, SPELL_STM, false);
player->AddSpellCooldown(SPELL_STM,0,time(NULL) + 7200); pPlayer->AddSpellCooldown(SPELL_STM,0,time(NULL) + 7200);
SendAction_npc_sayge(player, _Creature, action); SendAction_npc_sayge(pPlayer, _Creature, action);
break; break;
case GOSSIP_SENDER_MAIN+7: case GOSSIP_SENDER_MAIN+7:
_Creature->CastSpell(player, SPELL_STR, false); _Creature->CastSpell(pPlayer, SPELL_STR, false);
player->AddSpellCooldown(SPELL_STR,0,time(NULL) + 7200); pPlayer->AddSpellCooldown(SPELL_STR,0,time(NULL) + 7200);
SendAction_npc_sayge(player, _Creature, action); SendAction_npc_sayge(pPlayer, _Creature, action);
break; break;
case GOSSIP_SENDER_MAIN+8: case GOSSIP_SENDER_MAIN+8:
_Creature->CastSpell(player, SPELL_AGI, false); _Creature->CastSpell(pPlayer, SPELL_AGI, false);
player->AddSpellCooldown(SPELL_AGI,0,time(NULL) + 7200); pPlayer->AddSpellCooldown(SPELL_AGI,0,time(NULL) + 7200);
SendAction_npc_sayge(player, _Creature, action); SendAction_npc_sayge(pPlayer, _Creature, action);
break; break;
} }
return true; return true;
@@ -1421,21 +1421,21 @@ CreatureAI* GetAI_npc_tonk_mine(Creature *_Creature)
## npc_winter_reveler ## npc_winter_reveler
####*/ ####*/
bool ReceiveEmote_npc_winter_reveler( Player *player, Creature *_Creature, uint32 emote ) bool ReceiveEmote_npc_winter_reveler(Player* pPlayer, Creature *_Creature, uint32 emote)
{ {
//TODO: check auralist. //TODO: check auralist.
if(player->HasAura(26218)) if (pPlayer->HasAura(26218))
return false; return false;
if (emote == TEXTEMOTE_KISS) if (emote == TEXTEMOTE_KISS)
{ {
_Creature->CastSpell(_Creature, 26218, false); _Creature->CastSpell(_Creature, 26218, false);
player->CastSpell(player, 26218, false); pPlayer->CastSpell(pPlayer, 26218, false);
switch(rand()%3) switch(rand()%3)
{ {
case 0: _Creature->CastSpell(player, 26207, false); break; case 0: _Creature->CastSpell(pPlayer, 26207, false); break;
case 1: _Creature->CastSpell(player, 26206, false); break; case 1: _Creature->CastSpell(pPlayer, 26206, false); break;
case 2: _Creature->CastSpell(player, 45036, false); break; case 2: _Creature->CastSpell(pPlayer, 45036, false); break;
} }
} }
return true; return true;
@@ -1445,10 +1445,10 @@ bool ReceiveEmote_npc_winter_reveler( Player *player, Creature *_Creature, uint3
## npc_brewfest_reveler ## npc_brewfest_reveler
####*/ ####*/
bool ReceiveEmote_npc_brewfest_reveler( Player *player, Creature *_Creature, uint32 emote ) bool ReceiveEmote_npc_brewfest_reveler(Player* pPlayer, Creature *_Creature, uint32 emote)
{ {
if (emote == TEXTEMOTE_DANCE) if (emote == TEXTEMOTE_DANCE)
_Creature->CastSpell(player, 41586, false); _Creature->CastSpell(pPlayer, 41586, false);
return true; return true;
} }
@@ -1600,11 +1600,11 @@ struct TRINITY_DLL_DECL mob_mojoAI : public ScriptedAI
}hearts-=diff; }hearts-=diff;
} }
} }
void ReceiveEmote(Player *player, uint32 emote) void ReceiveEmote(Player* pPlayer, uint32 emote)
{ {
m_creature->HandleEmoteCommand(emote); m_creature->HandleEmoteCommand(emote);
Unit* own = m_creature->GetOwner(); Unit* own = m_creature->GetOwner();
if (!own || own->GetTypeId() != TYPEID_PLAYER || CAST_PLR(own)->GetTeam() != player->GetTeam()) if (!own || own->GetTypeId() != TYPEID_PLAYER || CAST_PLR(own)->GetTeam() != pPlayer->GetTeam())
return; return;
if (emote == TEXTEMOTE_KISS) if (emote == TEXTEMOTE_KISS)
{ {
@@ -1619,22 +1619,22 @@ struct TRINITY_DLL_DECL mob_mojoAI : public ScriptedAI
case 5:whisp.append("Feelin' a little froggy, are ya?");break; case 5:whisp.append("Feelin' a little froggy, are ya?");break;
case 6: case 6:
whisp.append("Listen, "); whisp.append("Listen, ");
whisp.append(player->GetName()); whisp.append(pPlayer->GetName());
whisp.append(", I know of a little swamp not too far from here...."); whisp.append(", I know of a little swamp not too far from here....");
break; break;
case 7:whisp.append("There's just never enough Mojo to go around...");break; case 7:whisp.append("There's just never enough Mojo to go around...");break;
} }
m_creature->MonsterWhisper(whisp.c_str(),player->GetGUID()); m_creature->MonsterWhisper(whisp.c_str(),pPlayer->GetGUID());
if (victimGUID) if (victimGUID)
{ {
Player* victim = Unit::GetPlayer(victimGUID); Player* victim = Unit::GetPlayer(victimGUID);
if (victim) if (victim)
victim->RemoveAura(43906);//remove polymorph frog thing victim->RemoveAura(43906);//remove polymorph frog thing
} }
m_creature->AddAura(43906,player);//add polymorph frog thing m_creature->AddAura(43906,pPlayer);//add polymorph frog thing
victimGUID = player->GetGUID(); victimGUID = pPlayer->GetGUID();
m_creature->CastSpell(m_creature,20372,true);//tag.hearts m_creature->CastSpell(m_creature,20372,true);//tag.hearts
m_creature->GetMotionMaster()->MoveFollow(player,0,0); m_creature->GetMotionMaster()->MoveFollow(pPlayer,0,0);
hearts = 15000; hearts = 15000;
} }
} }
src/bindings/scripts/scripts/zone/arathi_highlands/arathi_highlands.cpp
+15 -15
View File
@@ -54,12 +54,12 @@ struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
switch(i) switch(i)
{ {
case 4:DoScriptText(SAY_PROGRESS_2, m_creature, player);break; case 4:DoScriptText(SAY_PROGRESS_2, m_creature, pPlayer);break;
case 5:DoScriptText(SAY_PROGRESS_3, m_creature, player);break; case 5:DoScriptText(SAY_PROGRESS_3, m_creature, pPlayer);break;
case 8:DoScriptText(EMOTE_PROGRESS_4, m_creature);break; case 8:DoScriptText(EMOTE_PROGRESS_4, m_creature);break;
case 9: case 9:
{ {
@@ -67,15 +67,15 @@ struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI
m_creature->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96, -2142.49, 20.15, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0); m_creature->SummonCreature(MOB_VENGEFUL_SURGE, -2052.96, -2142.49, 20.15, 1.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
break; break;
} }
case 10:DoScriptText(SAY_PROGRESS_5, m_creature, player);break; case 10:DoScriptText(SAY_PROGRESS_5, m_creature, pPlayer);break;
case 11:DoScriptText(SAY_PROGRESS_6, m_creature, player);break; case 11:DoScriptText(SAY_PROGRESS_6, m_creature, pPlayer);break;
case 19:DoScriptText(SAY_PROGRESS_7, m_creature, player); break; case 19:DoScriptText(SAY_PROGRESS_7, m_creature, pPlayer); break;
case 20: case 20:
DoScriptText(EMOTE_PROGRESS_8, m_creature); DoScriptText(EMOTE_PROGRESS_8, m_creature);
DoScriptText(SAY_PROGRESS_9, m_creature, player); DoScriptText(SAY_PROGRESS_9, m_creature, pPlayer);
Completed = true; Completed = true;
if(player) if (pPlayer)
CAST_PLR(player)->GroupEventHappens(QUEST_SUNKEN_TREASURE, m_creature); CAST_PLR(pPlayer)->GroupEventHappens(QUEST_SUNKEN_TREASURE, m_creature);
break; break;
} }
} }
@@ -100,9 +100,9 @@ struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI
{ {
if (PlayerGUID && !Completed) if (PlayerGUID && !Completed)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (player) if (pPlayer)
CAST_PLR(player)->FailQuest(QUEST_SUNKEN_TREASURE); CAST_PLR(pPlayer)->FailQuest(QUEST_SUNKEN_TREASURE);
} }
} }
@@ -112,12 +112,12 @@ struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI
} }
}; };
bool QuestAccept_npc_professor_phizzlethorpe(Player* player, Creature* creature, Quest const* quest) bool QuestAccept_npc_professor_phizzlethorpe(Player* pPlayer, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_SUNKEN_TREASURE) if (quest->GetQuestId() == QUEST_SUNKEN_TREASURE)
{ {
DoScriptText(SAY_PROGRESS_1, creature, player); DoScriptText(SAY_PROGRESS_1, creature, pPlayer);
CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, pPlayer->GetGUID());
creature->setFaction(113); creature->setFaction(113);
} }
return true; return true;
src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp
+22 -22
View File
@@ -59,18 +59,18 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (!player) if (!pPlayer)
return; return;
switch (i) switch (i)
{ {
case 1: case 1:
DoScriptText(SAY_MOVE, m_creature, player); DoScriptText(SAY_MOVE, m_creature, pPlayer);
break; break;
case 8: case 8:
DoScriptText(SAY_PREPARE, m_creature, player); DoScriptText(SAY_PREPARE, m_creature, pPlayer);
break; break;
case 19: case 19:
//TODO: verify location and creatures amount. //TODO: verify location and creatures amount.
@@ -79,13 +79,13 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI
m_creature->SummonCreature(ENTRY_SILVERWING_WARRIOR,1778.73,-2049.50,109.83,1.67,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); m_creature->SummonCreature(ENTRY_SILVERWING_WARRIOR,1778.73,-2049.50,109.83,1.67,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000);
break; break;
case 20: case 20:
DoScriptText(SAY_WIN, m_creature, player); DoScriptText(SAY_WIN, m_creature, pPlayer);
Completed = true; Completed = true;
if (player && player->GetTypeId() == TYPEID_PLAYER) if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(player)->GroupEventHappens(QUEST_TOREK_ASSULT,m_creature); CAST_PLR(pPlayer)->GroupEventHappens(QUEST_TOREK_ASSULT,m_creature);
break; break;
case 21: case 21:
DoScriptText(SAY_END, m_creature, player); DoScriptText(SAY_END, m_creature, pPlayer);
break; break;
} }
} }
@@ -113,8 +113,8 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI
if (PlayerGUID && !Completed) if (PlayerGUID && !Completed)
{ {
if (Player* player = Unit::GetPlayer(PlayerGUID)) if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
CAST_PLR(player)->FailQuest(QUEST_TOREK_ASSULT); CAST_PLR(pPlayer)->FailQuest(QUEST_TOREK_ASSULT);
} }
} }
@@ -139,13 +139,13 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI
} }
}; };
bool QuestAccept_npc_torek(Player* player, Creature* creature, Quest const* quest) bool QuestAccept_npc_torek(Player* pPlayer, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_TOREK_ASSULT) if (quest->GetQuestId() == QUEST_TOREK_ASSULT)
{ {
//TODO: find companions, make them follow Torek, at any time (possibly done by mangos/database in future?) //TODO: find companions, make them follow Torek, at any time (possibly done by mangos/database in future?)
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, true, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(true, true, pPlayer->GetGUID());
DoScriptText(SAY_READY, creature, player); DoScriptText(SAY_READY, creature, pPlayer);
creature->setFaction(113); creature->setFaction(113);
} }
@@ -174,9 +174,9 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (!player) if (!pPlayer)
return; return;
switch(i) switch(i)
@@ -199,8 +199,8 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI
break; break;
case 21:{ case 21:{
if (player && player->GetTypeId() == TYPEID_PLAYER) if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(player)->GroupEventHappens(QUEST_FREEDOM_TO_RUUL,m_creature); CAST_PLR(pPlayer)->GroupEventHappens(QUEST_FREEDOM_TO_RUUL,m_creature);
break; } break; }
} }
@@ -227,9 +227,9 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI
{ {
if (PlayerGUID) if (PlayerGUID)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (player) if (pPlayer)
CAST_PLR(player)->FailQuest(QUEST_FREEDOM_TO_RUUL); CAST_PLR(pPlayer)->FailQuest(QUEST_FREEDOM_TO_RUUL);
} }
} }
@@ -239,12 +239,12 @@ struct TRINITY_DLL_DECL npc_ruul_snowhoofAI : public npc_escortAI
} }
}; };
bool QuestAccept_npc_ruul_snowhoof(Player* player, Creature* creature, Quest const* quest) bool QuestAccept_npc_ruul_snowhoof(Player* pPlayer, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL) if (quest->GetQuestId() == QUEST_FREEDOM_TO_RUUL)
{ {
creature->setFaction(113); creature->setFaction(113);
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
} }
return true; return true;
} }
src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp
+2 -2
View File
@@ -82,8 +82,8 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI
if (Inhibitmagic_Timer < diff) if (Inhibitmagic_Timer < diff)
{ {
float dist; float dist;
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList const &PlayerList = pMap->GetPlayers();
for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
if (Player* i_pl = i->getSource()) if (Player* i_pl = i->getSource())
if (i_pl->isAlive() && (dist = i_pl->IsWithinDist(m_creature, 45))) if (i_pl->isAlive() && (dist = i_pl->IsWithinDist(m_creature, 45)))
src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/instance_sethekk_halls.cpp
+3 -3
View File
@@ -28,7 +28,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_sethekk_halls : public ScriptedInstance struct TRINITY_DLL_DECL instance_sethekk_halls : public ScriptedInstance
{ {
instance_sethekk_halls(Map *map) : ScriptedInstance(map) {Initialize();}; instance_sethekk_halls(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint64 m_uiIkissDoorGUID; uint64 m_uiIkissDoorGUID;
@@ -55,9 +55,9 @@ struct TRINITY_DLL_DECL instance_sethekk_halls : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_sethekk_halls(Map* map) InstanceData* GetInstanceData_instance_sethekk_halls(Map* pMap)
{ {
return new instance_sethekk_halls(map); return new instance_sethekk_halls(pMap);
} }
void AddSC_instance_sethekk_halls() void AddSC_instance_sethekk_halls()
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
+2 -2
View File
@@ -272,8 +272,8 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
if (DrawShadows_Timer < diff) if (DrawShadows_Timer < diff)
{ {
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList const &PlayerList = pMap->GetPlayers();
for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
if (Player* i_pl = i->getSource()) if (Player* i_pl = i->getSource())
if (i_pl->isAlive() && !i_pl->HasAura(SPELL_BANISH)) if (i_pl->isAlive() && !i_pl->HasAura(SPELL_BANISH))
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
+3 -3
View File
@@ -38,7 +38,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
{ {
instance_shadow_labyrinth(Map *map) : ScriptedInstance(map) {Initialize();}; instance_shadow_labyrinth(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint32 Encounter[ENCOUNTERS]; uint32 Encounter[ENCOUNTERS];
std::string str_data; std::string str_data;
@@ -204,9 +204,9 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_shadow_labyrinth(Map* map) InstanceData* GetInstanceData_instance_shadow_labyrinth(Map* pMap)
{ {
return new instance_shadow_labyrinth(map); return new instance_shadow_labyrinth(pMap);
} }
void AddSC_instance_shadow_labyrinth() void AddSC_instance_shadow_labyrinth()
src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/boss_elder_nadox.cpp
+3 -3
View File
@@ -114,10 +114,10 @@ struct TRINITY_DLL_DECL boss_elder_nadoxAI : public ScriptedAI
AchievementEntry const *AchievRespectYourElders = GetAchievementStore()->LookupEntry(ACHIEVEMENT_RESPECT_YOUR_ELDERS); AchievementEntry const *AchievRespectYourElders = GetAchievementStore()->LookupEntry(ACHIEVEMENT_RESPECT_YOUR_ELDERS);
if (AchievRespectYourElders) if (AchievRespectYourElders)
{ {
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
if(map && map->IsDungeon()) if (pMap && pMap->IsDungeon())
{ {
Map::PlayerList const &players = map->GetPlayers(); Map::PlayerList const &players = pMap->GetPlayers();
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievRespectYourElders); itr->getSource()->CompletedAchievement(AchievRespectYourElders);
} }
src/bindings/scripts/scripts/zone/azjol_nerub/ahnkahet/instance_ahnkahet.cpp
+3 -3
View File
@@ -38,7 +38,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
{ {
instance_ahnkahet(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_ahnkahet(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint64 Elder_Nadox; uint64 Elder_Nadox;
uint64 Prince_Taldaram; uint64 Prince_Taldaram;
@@ -179,9 +179,9 @@ struct TRINITY_DLL_DECL instance_ahnkahet : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_ahnkahet(Map* map) InstanceData* GetInstanceData_instance_ahnkahet(Map* pMap)
{ {
return new instance_ahnkahet(map); return new instance_ahnkahet(pMap);
} }
void AddSC_instance_ahnkahet() void AddSC_instance_ahnkahet()
src/bindings/scripts/scripts/zone/azjol_nerub/azjol_nerub/instance_azjol_nerub.cpp
+3 -3
View File
@@ -36,7 +36,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance
{ {
instance_azjol_nerub(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_azjol_nerub(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint64 Krikthir; uint64 Krikthir;
uint64 Hadronox; uint64 Hadronox;
@@ -165,9 +165,9 @@ struct TRINITY_DLL_DECL instance_azjol_nerub : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_azjol_nerub(Map* map) InstanceData* GetInstanceData_instance_azjol_nerub(Map* pMap)
{ {
return new instance_azjol_nerub(map); return new instance_azjol_nerub(pMap);
} }
void AddSC_instance_azjol_nerub() void AddSC_instance_azjol_nerub()
src/bindings/scripts/scripts/zone/azshara/azshara.cpp
+45 -45
View File
@@ -97,54 +97,54 @@ CreatureAI* GetAI_mobs_spitelashes(Creature *_Creature)
## npc_loramus_thalipedes ## npc_loramus_thalipedes
######*/ ######*/
bool GossipHello_npc_loramus_thalipedes(Player *player, Creature *_Creature) bool GossipHello_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (player->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(2744) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you help me?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Can you help me?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (player->GetQuestStatus(3141) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(3141) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me your story", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Tell me your story", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_loramus_thalipedes(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_loramus_thalipedes(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(2744); pPlayer->AreaExploredOrEventHappens(2744);
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Please continue", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
player->SEND_GOSSIP_MENU(1813, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1813, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+21: case GOSSIP_ACTION_INFO_DEF+21:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I do not understand", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I do not understand", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
player->SEND_GOSSIP_MENU(1814, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1814, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+22: case GOSSIP_ACTION_INFO_DEF+22:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Indeed", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Indeed", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
player->SEND_GOSSIP_MENU(1815, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1815, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+23: case GOSSIP_ACTION_INFO_DEF+23:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will do this with or your help, Loramus", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will do this with or your help, Loramus", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
player->SEND_GOSSIP_MENU(1816, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1816, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+24: case GOSSIP_ACTION_INFO_DEF+24:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
player->SEND_GOSSIP_MENU(1817, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1817, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+25: case GOSSIP_ACTION_INFO_DEF+25:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(3141); pPlayer->AreaExploredOrEventHappens(3141);
break; break;
} }
return true; return true;
@@ -292,15 +292,15 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI
if (Teleport_Timer < diff) if (Teleport_Timer < diff)
{ {
//temp solution - unit can't be teleported by core using spelleffect 5, only players //temp solution - unit can't be teleported by core using spelleffect 5, only players
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
if(map) if (pMap)
{ {
map->CreatureRelocation(m_creature, 3706.39, -3969.15, 35.9118, 0); pMap->CreatureRelocation(m_creature, 3706.39, -3969.15, 35.9118, 0);
m_creature->AI_SendMoveToPacket(3706.39, -3969.15, 35.9118, 0, 0, 0); m_creature->AI_SendMoveToPacket(3706.39, -3969.15, 35.9118, 0, 0, 0);
} }
//begin swimming and summon depth charges //begin swimming and summon depth charges
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
SendText(MSG_ESCAPE_NOTICE, player); SendText(MSG_ESCAPE_NOTICE, pPlayer);
DoCast(m_creature, SPELL_PERIODIC_DEPTH_CHARGE); DoCast(m_creature, SPELL_PERIODIC_DEPTH_CHARGE);
m_creature->SetUnitMovementFlags(MOVEMENTFLAG_HOVER | MOVEMENTFLAG_SWIMMING); m_creature->SetUnitMovementFlags(MOVEMENTFLAG_HOVER | MOVEMENTFLAG_SWIMMING);
m_creature->SetSpeed(MOVE_RUN, 0.85f, true); m_creature->SetSpeed(MOVE_RUN, 0.85f, true);
@@ -320,25 +320,25 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI
if (Grenade_Timer < diff) if (Grenade_Timer < diff)
{ {
Player *player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(player) if (pPlayer)
{ {
DoScriptText(SAY_RIZZLE_GRENADE, m_creature, player); DoScriptText(SAY_RIZZLE_GRENADE, m_creature, pPlayer);
DoCast(player, SPELL_RIZZLE_FROST_GRENADE, true); DoCast(pPlayer, SPELL_RIZZLE_FROST_GRENADE, true);
} }
Grenade_Timer = 30000; Grenade_Timer = 30000;
} else Grenade_Timer -= diff; } else Grenade_Timer -= diff;
if (Check_Timer < diff) if (Check_Timer < diff)
{ {
Player *player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(!player) if (!pPlayer)
{ {
m_creature->ForcedDespawn(); m_creature->ForcedDespawn();
return; return;
} }
if(m_creature->IsWithinDist(player, 10) && m_creature->GetPositionX() > player->GetPositionX() && !Reached) if (m_creature->IsWithinDist(pPlayer, 10) && m_creature->GetPositionX() > pPlayer->GetPositionX() && !Reached)
{ {
DoScriptText(SAY_RIZZLE_FINAL, m_creature); DoScriptText(SAY_RIZZLE_FINAL, m_creature);
m_creature->SetUInt32Value(UNIT_NPC_FLAGS, 1); m_creature->SetUInt32Value(UNIT_NPC_FLAGS, 1);
@@ -353,12 +353,12 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI
} }
void SendText(const char *text, Player* player) void SendText(const char *text, Player* pPlayer)
{ {
WorldPacket data(SMSG_SERVER_MESSAGE, 0); // guess size WorldPacket data(SMSG_SERVER_MESSAGE, 0); // guess size
data << text; data << text;
if(player) if (pPlayer)
player->GetSession()->SendPacket(&data); pPlayer->GetSession()->SendPacket(&data);
} }
void AttackStart(Unit *who) void AttackStart(Unit *who)
@@ -394,21 +394,21 @@ struct TRINITY_DLL_DECL mob_rizzle_sprysprocketAI : public ScriptedAI
}; };
bool GossipHello_mob_rizzle_sprysprocket(Player *player, Creature *_Creature) bool GossipHello_mob_rizzle_sprysprocket(Player* pPlayer, Creature *_Creature)
{ {
if(player->GetQuestStatus(10994) != QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10994) != QUEST_STATUS_INCOMPLETE)
return true; return true;
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GET_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GET_MOONSTONE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(10811,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10811,_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_mob_rizzle_sprysprocket(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_mob_rizzle_sprysprocket(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1 && player->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE) if (action == GOSSIP_ACTION_INFO_DEF + 1 && pPlayer->GetQuestStatus(10994) == QUEST_STATUS_INCOMPLETE)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
_Creature->CastSpell(player, SPELL_GIVE_SOUTHFURY_MOONSTONE, true); _Creature->CastSpell(pPlayer, SPELL_GIVE_SOUTHFURY_MOONSTONE, true);
CAST_AI(mob_rizzle_sprysprocketAI, _Creature->AI())->Must_Die_Timer = 3000; CAST_AI(mob_rizzle_sprysprocketAI, _Creature->AI())->Must_Die_Timer = 3000;
CAST_AI(mob_rizzle_sprysprocketAI, _Creature->AI())->Must_Die = true; CAST_AI(mob_rizzle_sprysprocketAI, _Creature->AI())->Must_Die = true;
} }
src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp
+21 -21
View File
@@ -258,22 +258,22 @@ CreatureAI* GetAI_npc_engineer_spark_overgrind(Creature *_Creature)
return new npc_engineer_spark_overgrindAI (_Creature); return new npc_engineer_spark_overgrindAI (_Creature);
} }
bool GossipHello_npc_engineer_spark_overgrind(Player *player, Creature *_Creature) bool GossipHello_npc_engineer_spark_overgrind(Player* pPlayer, Creature *_Creature)
{ {
if( player->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE ) if (pPlayer->GetQuestStatus(QUEST_GNOMERCY) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FIGHT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_engineer_spark_overgrind(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_engineer_spark_overgrind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF) if (action == GOSSIP_ACTION_INFO_DEF)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
_Creature->setFaction(FACTION_HOSTILE); _Creature->setFaction(FACTION_HOSTILE);
CAST_AI(npc_engineer_spark_overgrindAI, _Creature->AI())->AttackStart(player); CAST_AI(npc_engineer_spark_overgrindAI, _Creature->AI())->AttackStart(pPlayer);
} }
return true; return true;
} }
@@ -338,26 +338,26 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (!player) if (!pPlayer)
return; return;
switch(i) switch(i)
{ {
case 0: case 0:
DoScriptText(SAY_START, m_creature, player); DoScriptText(SAY_START, m_creature, pPlayer);
break; break;
case 17: case 17:
DoScriptText(SAY_PROGRESS, m_creature, player); DoScriptText(SAY_PROGRESS, m_creature, pPlayer);
break; break;
case 28: case 28:
DoScriptText(SAY_END1, m_creature, player); DoScriptText(SAY_END1, m_creature, pPlayer);
break; break;
case 29: case 29:
DoScriptText(EMOTE_HUG, m_creature, player); DoScriptText(EMOTE_HUG, m_creature, pPlayer);
DoScriptText(SAY_END2, m_creature, player); DoScriptText(SAY_END2, m_creature, pPlayer);
player->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP,m_creature); pPlayer->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP,m_creature);
break; break;
} }
} }
@@ -377,9 +377,9 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI
{ {
if (PlayerGUID) if (PlayerGUID)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (player) if (pPlayer)
player->FailQuest(QUEST_A_CRY_FOR_SAY_HELP); pPlayer->FailQuest(QUEST_A_CRY_FOR_SAY_HELP);
} }
} }
@@ -389,12 +389,12 @@ struct TRINITY_DLL_DECL npc_magwinAI : public npc_escortAI
} }
}; };
bool QuestAccept_npc_magwin(Player* player, Creature* creature, Quest const* quest) bool QuestAccept_npc_magwin(Player* pPlayer, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP) if (quest->GetQuestId() == QUEST_A_CRY_FOR_SAY_HELP)
{ {
creature->setFaction(113); creature->setFaction(113);
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
} }
return true; return true;
} }
@@ -510,7 +510,7 @@ struct TRINITY_DLL_DECL npc_geezleAI : public ScriptedAI
std::list<GameObject*> FlagList; std::list<GameObject*> FlagList;
m_creature->GetGameObjectListWithEntryInGrid(FlagList,GO_NAGA_FLAG, 50.0f); m_creature->GetGameObjectListWithEntryInGrid(FlagList,GO_NAGA_FLAG, 50.0f);
Player* player = NULL; Player* pPlayer = NULL;
if (!FlagList.empty()) if (!FlagList.empty())
{ {
for(std::list<GameObject*>::iterator itr = FlagList.begin(); itr != FlagList.end(); ++itr) for(std::list<GameObject*>::iterator itr = FlagList.begin(); itr != FlagList.end(); ++itr)
src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp
+17 -17
View File
@@ -68,24 +68,24 @@ bool GossipSelect_npc_beaten_corpse(Player* pPlayer, Creature* pCreature, uint32
#define GOSSIP_SPUTTERVALVE "Can you tell me about this shard?" #define GOSSIP_SPUTTERVALVE "Can you tell me about this shard?"
bool GossipHello_npc_sputtervalve(Player *player, Creature *_Creature) bool GossipHello_npc_sputtervalve(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if( player->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(6981) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SPUTTERVALVE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SPUTTERVALVE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_sputtervalve(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_sputtervalve(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF) if (action == GOSSIP_ACTION_INFO_DEF)
{ {
player->SEND_GOSSIP_MENU(2013, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2013, _Creature->GetGUID());
player->AreaExploredOrEventHappens(6981); pPlayer->AreaExploredOrEventHappens(6981);
} }
return true; return true;
} }
@@ -435,9 +435,9 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(!player) if (!pPlayer)
return; return;
switch(i) switch(i)
@@ -445,7 +445,7 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI
case 0: DoScriptText(SAY_PROGRESS_1, m_creature); case 0: DoScriptText(SAY_PROGRESS_1, m_creature);
m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break; m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
case 1: DoScriptText(SAY_PROGRESS_2, m_creature); break; case 1: DoScriptText(SAY_PROGRESS_2, m_creature); break;
case 10: DoScriptText(SAY_PROGRESS_3, m_creature, player); case 10: DoScriptText(SAY_PROGRESS_3, m_creature, pPlayer);
m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break; m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
case 20:{ case 20:{
Unit* Mercenary = m_creature->FindNearestCreature(MOB_MERCENARY, 99); Unit* Mercenary = m_creature->FindNearestCreature(MOB_MERCENARY, 99);
@@ -464,7 +464,7 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI
case 31: m_creature->SummonCreature(NPC_PILOT, 1088.77, -2985.39, 91.84, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000); case 31: m_creature->SummonCreature(NPC_PILOT, 1088.77, -2985.39, 91.84, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 300000);
m_creature->setDeathState(JUST_DIED); m_creature->setDeathState(JUST_DIED);
Completed = true; Completed = true;
player->GroupEventHappens(QUEST_ESCAPE, m_creature); pPlayer->GroupEventHappens(QUEST_ESCAPE, m_creature);
break; break;
} }
} }
@@ -487,9 +487,9 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI
{ {
if (PlayerGUID && !Completed) if (PlayerGUID && !Completed)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (player) if (pPlayer)
player->FailQuest(QUEST_ESCAPE); pPlayer->FailQuest(QUEST_ESCAPE);
} }
} }
@@ -499,12 +499,12 @@ struct TRINITY_DLL_DECL npc_wizzlecrank_shredderAI : public npc_escortAI
} }
}; };
bool QuestAccept_npc_wizzlecrank_shredder(Player* player, Creature* creature, Quest const* quest) bool QuestAccept_npc_wizzlecrank_shredder(Player* pPlayer, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_ESCAPE) if (quest->GetQuestId() == QUEST_ESCAPE)
{ {
creature->setFaction(FACTION_RATCHET); creature->setFaction(FACTION_RATCHET);
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
} }
return true; return true;
} }
src/bindings/scripts/scripts/zone/black_temple/black_temple.cpp
+7 -7
View File
@@ -35,24 +35,24 @@ EndContentData */
#define SPELL_TELEPORT 41566 // s41566 - Teleport to Ashtongue NPC's #define SPELL_TELEPORT 41566 // s41566 - Teleport to Ashtongue NPC's
#define GOSSIP_OLUM1 "Teleport me to the other Ashtongue Deathsworn" #define GOSSIP_OLUM1 "Teleport me to the other Ashtongue Deathsworn"
bool GossipHello_npc_spirit_of_olum(Player* player, Creature* _Creature) bool GossipHello_npc_spirit_of_olum(Player* pPlayer, Creature* _Creature)
{ {
ScriptedInstance* pInstance = (_Creature->GetInstanceData()); ScriptedInstance* pInstance = (_Creature->GetInstanceData());
if (pInstance && (pInstance->GetData(DATA_SUPREMUSEVENT) >= DONE) && (pInstance->GetData(DATA_HIGHWARLORDNAJENTUSEVENT) >= DONE)) if (pInstance && (pInstance->GetData(DATA_SUPREMUSEVENT) >= DONE) && (pInstance->GetData(DATA_HIGHWARLORDNAJENTUSEVENT) >= DONE))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_OLUM1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_spirit_of_olum(Player* player, Creature* _Creature, uint32 sender, uint32 action) bool GossipSelect_npc_spirit_of_olum(Player* pPlayer, Creature* _Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1) if (action == GOSSIP_ACTION_INFO_DEF + 1)
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->InterruptNonMeleeSpells(false); pPlayer->InterruptNonMeleeSpells(false);
player->CastSpell(player, SPELL_TELEPORT, false); pPlayer->CastSpell(pPlayer, SPELL_TELEPORT, false);
return true; return true;
} }
src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
+5 -5
View File
@@ -1568,20 +1568,20 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
}; };
bool GossipSelect_npc_akama_at_illidan(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_akama_at_illidan(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event if (action == GOSSIP_ACTION_INFO_DEF) // Time to begin the Event
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_akama_illidanAI, _Creature->AI())->EnterPhase(PHASE_CHANNEL); CAST_AI(npc_akama_illidanAI, _Creature->AI())->EnterPhase(PHASE_CHANNEL);
} }
return true; return true;
} }
bool GossipHello_npc_akama_at_illidan(Player *player, Creature *_Creature) bool GossipHello_npc_akama_at_illidan(Player* pPlayer, Creature *_Creature)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(10465, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10465, _Creature->GetGUID());
return true; return true;
} }
src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp
+7 -7
View File
@@ -820,23 +820,23 @@ CreatureAI* GetAI_npc_akama_shade(Creature *_Creature)
return new npc_akamaAI (_Creature); return new npc_akamaAI (_Creature);
} }
bool GossipSelect_npc_akama(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_akama(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_akamaAI, _Creature->AI())->BeginEvent(player); CAST_AI(npc_akamaAI, _Creature->AI())->BeginEvent(pPlayer);
} }
return true; return true;
} }
bool GossipHello_npc_akama(Player *player, Creature *_Creature) bool GossipHello_npc_akama(Player* pPlayer, Creature *_Creature)
{ {
if(player->isAlive()) if (pPlayer->isAlive())
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(907, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
} }
return true; return true;
src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp
+2 -2
View File
@@ -193,13 +193,13 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
} }
}; };
bool GOHello_go_najentus_spine(Player *player, GameObject* _GO) bool GOHello_go_najentus_spine(Player* pPlayer, GameObject* _GO)
{ {
if (ScriptedInstance* pInstance = _GO->GetInstanceData()) if (ScriptedInstance* pInstance = _GO->GetInstanceData())
if (Creature* Najentus = Unit::GetCreature(*_GO, pInstance->GetData64(DATA_HIGHWARLORDNAJENTUS))) if (Creature* Najentus = Unit::GetCreature(*_GO, pInstance->GetData64(DATA_HIGHWARLORDNAJENTUS)))
if (CAST_AI(boss_najentusAI, Najentus->AI())->RemoveImpalingSpine()) if (CAST_AI(boss_najentusAI, Najentus->AI())->RemoveImpalingSpine())
{ {
player->CastSpell(player, SPELL_CREATE_NAJENTUS_SPINE, true); pPlayer->CastSpell(pPlayer, SPELL_CREATE_NAJENTUS_SPINE, true);
_GO->DeleteObjectWithOwner(); _GO->DeleteObjectWithOwner();
} }
return true; return true;
src/bindings/scripts/scripts/zone/black_temple/instance_black_temple.cpp
+3 -3
View File
@@ -40,7 +40,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
{ {
instance_black_temple(Map *map) : ScriptedInstance(map) {Initialize();}; instance_black_temple(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint32 Encounters[ENCOUNTERS]; uint32 Encounters[ENCOUNTERS];
std::string str_data; std::string str_data;
@@ -331,9 +331,9 @@ struct TRINITY_DLL_DECL instance_black_temple : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_black_temple(Map* map) InstanceData* GetInstanceData_instance_black_temple(Map* pMap)
{ {
return new instance_black_temple(map); return new instance_black_temple(pMap);
} }
void AddSC_instance_black_temple() void AddSC_instance_black_temple()
src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
+66 -66
View File
@@ -65,9 +65,9 @@ uint32 RingBoss[]=
9032, // Hedrum 9032, // Hedrum
}; };
bool AreaTrigger_at_ring_of_law(Player *player, AreaTriggerEntry *at) bool AreaTrigger_at_ring_of_law(Player* pPlayer, AreaTriggerEntry *at)
{ {
ScriptedInstance* pInstance = (player->GetInstanceData()); ScriptedInstance* pInstance = (pPlayer->GetInstanceData());
if (pInstance) if (pInstance)
{ {
@@ -75,7 +75,7 @@ bool AreaTrigger_at_ring_of_law(Player *player, AreaTriggerEntry *at)
return false; return false;
pInstance->SetData(TYPE_RING_OF_LAW,IN_PROGRESS); pInstance->SetData(TYPE_RING_OF_LAW,IN_PROGRESS);
player->SummonCreature(C_GRIMSTONE,625.559,-205.618,-52.735,2.609,TEMPSUMMON_DEAD_DESPAWN,0); pPlayer->SummonCreature(C_GRIMSTONE,625.559,-205.618,-52.735,2.609,TEMPSUMMON_DEAD_DESPAWN,0);
return false; return false;
} }
@@ -393,68 +393,68 @@ CreatureAI* GetAI_mob_phalanx(Creature *_Creature)
#define GOSSIP_ITEM_KHARAN_9 "Indeed." #define GOSSIP_ITEM_KHARAN_9 "Indeed."
#define GOSSIP_ITEM_KHARAN_10 "The door is open, Kharan. You are a free man." #define GOSSIP_ITEM_KHARAN_10 "The door is open, Kharan. You are a free man."
bool GossipHello_npc_kharan_mighthammer(Player *player, Creature *_Creature) bool GossipHello_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if( player->GetQuestStatus(QUEST_4001) == QUEST_STATUS_INCOMPLETE ) if (pPlayer->GetQuestStatus(QUEST_4001) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if( player->GetQuestStatus(4342) == QUEST_STATUS_INCOMPLETE ) if (pPlayer->GetQuestStatus(4342) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
if (player->GetTeam() == HORDE) if (pPlayer->GetTeam() == HORDE)
player->SEND_GOSSIP_MENU(2473, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2473, _Creature->GetGUID());
else else
player->SEND_GOSSIP_MENU(2474, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2474, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_kharan_mighthammer(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_kharan_mighthammer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(2475, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2475, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->SEND_GOSSIP_MENU(2476, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2476, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
player->SEND_GOSSIP_MENU(2477, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2477, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
player->SEND_GOSSIP_MENU(2478, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2478, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
player->SEND_GOSSIP_MENU(2479, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2479, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
player->SEND_GOSSIP_MENU(2480, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2480, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+7: case GOSSIP_ACTION_INFO_DEF+7:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+8);
player->SEND_GOSSIP_MENU(2481, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2481, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+8: case GOSSIP_ACTION_INFO_DEF+8:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_KHARAN_10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+9);
player->SEND_GOSSIP_MENU(2482, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2482, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+9: case GOSSIP_ACTION_INFO_DEF+9:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
if (player->GetTeam() == HORDE) if (pPlayer->GetTeam() == HORDE)
player->AreaExploredOrEventHappens(QUEST_4001); pPlayer->AreaExploredOrEventHappens(QUEST_4001);
else else
player->AreaExploredOrEventHappens(QUEST_4342); pPlayer->AreaExploredOrEventHappens(QUEST_4342);
break; break;
} }
return true; return true;
@@ -472,38 +472,38 @@ bool GossipSelect_npc_kharan_mighthammer(Player *player, Creature *_Creature, ui
#define GOSSIP_ITEM_SHOW_ACCESS "Show me what I have access to, Lothos." #define GOSSIP_ITEM_SHOW_ACCESS "Show me what I have access to, Lothos."
#define GOSSIP_ITEM_GET_CONTRACT "Get Thorium Brotherhood Contract" #define GOSSIP_ITEM_GET_CONTRACT "Get Thorium Brotherhood Contract"
bool GossipHello_npc_lokhtos_darkbargainer(Player *player, Creature *_Creature) bool GossipHello_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (_Creature->isVendor() && player->GetReputationRank(59) >= REP_FRIENDLY) if (_Creature->isVendor() && pPlayer->GetReputationRank(59) >= REP_FRIENDLY)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_ITEM_SHOW_ACCESS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
if (player->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) != 1 && if (pPlayer->GetQuestRewardStatus(QUEST_A_BINDING_CONTRACT) != 1 &&
!player->HasItemCount(ITEM_THRORIUM_BROTHERHOOD_CONTRACT, 1, true) && !pPlayer->HasItemCount(ITEM_THRORIUM_BROTHERHOOD_CONTRACT, 1, true) &&
player->HasItemCount(ITEM_SULFURON_INGOT, 1)) pPlayer->HasItemCount(ITEM_SULFURON_INGOT, 1))
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GET_CONTRACT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_GET_CONTRACT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
} }
if (player->GetReputationRank(59) < REP_FRIENDLY) if (pPlayer->GetReputationRank(59) < REP_FRIENDLY)
player->SEND_GOSSIP_MENU(3673, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(3673, _Creature->GetGUID());
else else
player->SEND_GOSSIP_MENU(3677, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(3677, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_lokhtos_darkbargainer(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_lokhtos_darkbargainer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1) if (action == GOSSIP_ACTION_INFO_DEF + 1)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false); pPlayer->CastSpell(pPlayer, SPELL_CREATE_THORIUM_BROTHERHOOD_CONTRACT_DND, false);
} }
if (action == GOSSIP_ACTION_TRADE) if (action == GOSSIP_ACTION_TRADE)
player->SEND_VENDORLIST( _Creature->GetGUID() ); pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
return true; return true;
} }
@@ -578,22 +578,22 @@ CreatureAI* GetAI_npc_dughal_stormwing(Creature *_Creature)
return dughal_stormwingAI; return dughal_stormwingAI;
} }
bool GossipHello_npc_dughal_stormwing(Player *player, Creature *_Creature) bool GossipHello_npc_dughal_stormwing(Player* pPlayer, Creature *_Creature)
{ {
if(player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS ) if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DUGHAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(2846, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2846, _Creature->GetGUID());
} }
return true; return true;
} }
bool GossipSelect_npc_dughal_stormwing(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_dughal_stormwing(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1) if (action == GOSSIP_ACTION_INFO_DEF + 1)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, player->GetGUID()); CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID());
_Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); _Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS); pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS);
} }
@@ -615,7 +615,7 @@ bool GossipSelect_npc_dughal_stormwing(Player *player, Creature *_Creature, uint
#define SAY_WINDSOR_9 "Ah, there it is!" #define SAY_WINDSOR_9 "Ah, there it is!"
#define MOB_ENTRY_REGINALD_WINDSOR 9682 #define MOB_ENTRY_REGINALD_WINDSOR 9682
Player* PlayerStart; Player* pPlayerStart;
/* /*
struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI
{ {
@@ -744,13 +744,13 @@ CreatureAI* GetAI_npc_marshal_windsor(Creature *_Creature)
return marshal_windsorAI; return marshal_windsorAI;
} }
bool QuestAccept_npc_marshal_windsor(Player *player, Creature *creature, Quest const *quest ) bool QuestAccept_npc_marshal_windsor(Player* pPlayer, Creature *creature, Quest const *quest)
{ {
if (quest->GetQuestId() == 4322) if (quest->GetQuestId() == 4322)
{PlayerStart = player; {PlayerStart = player;
if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED)
{ {
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS); pInstance->SetData(DATA_QUEST_JAIL_BREAK,ENCOUNTER_STATE_IN_PROGRESS);
creature->setFaction(11); creature->setFaction(11);
} }
@@ -1043,22 +1043,22 @@ CreatureAI* GetAI_npc_tobias_seecher(Creature *_Creature)
return tobias_seecherAI; return tobias_seecherAI;
} }
bool GossipHello_npc_tobias_seecher(Player *player, Creature *_Creature) bool GossipHello_npc_tobias_seecher(Player* pPlayer, Creature *_Creature)
{ {
if(player->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS ) if (pPlayer->GetQuestStatus(QUEST_JAIL_BREAK) == QUEST_STATUS_INCOMPLETE && pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_IN_PROGRESS)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Get out of here, Tobias, you're free!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Get out of here, Tobias, you're free!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(2847, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2847, _Creature->GetGUID());
} }
return true; return true;
} }
bool GossipSelect_npc_tobias_seecher(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_tobias_seecher(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1) if (action == GOSSIP_ACTION_INFO_DEF + 1)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, player->GetGUID()); CAST_AI(npc_escortAI, (_Creature->AI()))->Start(false, true, pPlayer->GetGUID());
_Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); _Creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_IN_PROGRESS); pInstance->SetData(DATA_TOBIAS,ENCOUNTER_STATE_IN_PROGRESS);
} }
@@ -1174,7 +1174,7 @@ CreatureAI* GetAI_npc_rocknot(Creature *_Creature)
return Rocknot_AI; return Rocknot_AI;
} }
bool ChooseReward_npc_rocknot(Player *player, Creature *_Creature, const Quest *_Quest, uint32 item) bool ChooseReward_npc_rocknot(Player* pPlayer, Creature *_Creature, const Quest *_Quest, uint32 item)
{ {
ScriptedInstance* pInstance = (_Creature->GetInstanceData()); ScriptedInstance* pInstance = (_Creature->GetInstanceData());
src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp
+23 -23
View File
@@ -580,36 +580,36 @@ CreatureAI* GetAI_boss_gloomrel(Creature *_Creature)
#define GOSSIP_ITEM_TEACH_2 "Continue..." #define GOSSIP_ITEM_TEACH_2 "Continue..."
#define GOSSIP_ITEM_TRIBUTE "I want to pay tribute" #define GOSSIP_ITEM_TRIBUTE "I want to pay tribute"
bool GossipHello_boss_gloomrel(Player *player, Creature *_Creature) bool GossipHello_boss_gloomrel(Player* pPlayer, Creature *_Creature)
{ {
if (player->GetQuestRewardStatus(4083) == 1 && player->GetSkillValue(SKILL_MINING) >= 230 && !player->HasSpell(14891) ) if (pPlayer->GetQuestRewardStatus(4083) == 1 && pPlayer->GetSkillValue(SKILL_MINING) >= 230 && !pPlayer->HasSpell(14891))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
if (player->GetQuestRewardStatus(4083) == 0 && player->GetSkillValue(SKILL_MINING) >= 230) if (pPlayer->GetQuestRewardStatus(4083) == 0 && pPlayer->GetSkillValue(SKILL_MINING) >= 230)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_boss_gloomrel(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_boss_gloomrel(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
player->SEND_GOSSIP_MENU(2606, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2606, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+11: case GOSSIP_ACTION_INFO_DEF+11:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
_Creature->CastSpell(player, 14894, false); _Creature->CastSpell(pPlayer, 14894, false);
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
player->SEND_GOSSIP_MENU(2604, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2604, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+22: case GOSSIP_ACTION_INFO_DEF+22:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
if (ScriptedInstance* pInstance = _Creature->GetInstanceData()) if (ScriptedInstance* pInstance = _Creature->GetInstanceData())
{ {
//are 5 minutes expected? go template may have data to despawn when used at quest //are 5 minutes expected? go template may have data to despawn when used at quest
@@ -743,31 +743,31 @@ CreatureAI* GetAI_boss_doomrel(Creature *_Creature)
#define GOSSIP_ITEM_CHALLENGE "Your bondage is at an end, Doom'rel. I challenge you!" #define GOSSIP_ITEM_CHALLENGE "Your bondage is at an end, Doom'rel. I challenge you!"
bool GossipHello_boss_doomrel(Player *player, Creature *_Creature) bool GossipHello_boss_doomrel(Player* pPlayer, Creature *_Creature)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(2601, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2601, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_boss_doomrel(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_boss_doomrel(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(2605, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2605, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
//start event here //start event here
_Creature->setFaction(FACTION_HOSTILE); _Creature->setFaction(FACTION_HOSTILE);
_Creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); _Creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
_Creature->AI()->AttackStart(player); _Creature->AI()->AttackStart(pPlayer);
ScriptedInstance* pInstance = _Creature->GetInstanceData(); ScriptedInstance* pInstance = _Creature->GetInstanceData();
if (pInstance) if (pInstance)
pInstance->SetData64(DATA_EVENSTARTER,player->GetGUID()); pInstance->SetData64(DATA_EVENSTARTER,pPlayer->GetGUID());
break; break;
} }
return true; return true;
src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp
+3 -3
View File
@@ -72,7 +72,7 @@ enum
struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
{ {
instance_blackrock_depths(Map *map) : ScriptedInstance(map) {Initialize();}; instance_blackrock_depths(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint32 Encounter[ENCOUNTERS]; uint32 Encounter[ENCOUNTERS];
std::string str_data; std::string str_data;
@@ -408,9 +408,9 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_blackrock_depths(Map* map) InstanceData* GetInstanceData_instance_blackrock_depths(Map* pMap)
{ {
return new instance_blackrock_depths(map); return new instance_blackrock_depths(pMap);
} }
void AddSC_instance_blackrock_depths() void AddSC_instance_blackrock_depths()
src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp
+8 -8
View File
@@ -215,27 +215,27 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
} }
}; };
void SendDefaultMenu_boss_vael(Player *player, Creature *_Creature, uint32 action) void SendDefaultMenu_boss_vael(Player* pPlayer, Creature *_Creature, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time if (action == GOSSIP_ACTION_INFO_DEF + 1) //Fight time
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(boss_vaelAI, _Creature->AI())->BeginSpeach(player); CAST_AI(boss_vaelAI, _Creature->AI())->BeginSpeach(pPlayer);
} }
} }
bool GossipSelect_boss_vael(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_boss_vael(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (sender == GOSSIP_SENDER_MAIN) if (sender == GOSSIP_SENDER_MAIN)
SendDefaultMenu_boss_vael(player, _Creature, action); SendDefaultMenu_boss_vael(pPlayer, _Creature, action);
return true; return true;
} }
bool GossipHello_boss_vael(Player *player, Creature *_Creature) bool GossipHello_boss_vael(Player* pPlayer, Creature *_Creature)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(907,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(907,_Creature->GetGUID());
return true; return true;
} }
src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp
+11 -11
View File
@@ -209,7 +209,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
void MoveInLineOfSight(Unit *who) void MoveInLineOfSight(Unit *who)
{ {
//We simply use this function to find players until we can use Map->GetPlayers() //We simply use this function to find players until we can use pMap->GetPlayers()
if (who && who->GetTypeId() == TYPEID_PLAYER && m_creature->IsHostileTo(who)) if (who && who->GetTypeId() == TYPEID_PLAYER && m_creature->IsHostileTo(who))
{ {
@@ -350,29 +350,29 @@ CreatureAI* GetAI_boss_victor_nefarius(Creature *_Creature)
return new boss_victor_nefariusAI (_Creature); return new boss_victor_nefariusAI (_Creature);
} }
bool GossipHello_boss_victor_nefarius(Player *player, Creature *_Creature) bool GossipHello_boss_victor_nefarius(Player* pPlayer, Creature *_Creature)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1 , GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(7134,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7134,_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_boss_victor_nefarius(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_boss_victor_nefarius(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(7198, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7198, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->SEND_GOSSIP_MENU(7199, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(7199, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
DoScriptText(SAY_GAMESBEGIN_1, _Creature); DoScriptText(SAY_GAMESBEGIN_1, _Creature);
CAST_AI(boss_victor_nefariusAI, _Creature->AI())->BeginEvent(player); CAST_AI(boss_victor_nefariusAI, _Creature->AI())->BeginEvent(pPlayer);
break; break;
} }
return true; return true;
src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp
+18 -18
View File
@@ -281,22 +281,22 @@ CreatureAI* GetAI_npc_daranelle(Creature *_Creature)
## npc_overseer_nuaar ## npc_overseer_nuaar
######*/ ######*/
bool GossipHello_npc_overseer_nuaar(Player *player, Creature *_Creature) bool GossipHello_npc_overseer_nuaar(Player* pPlayer, Creature *_Creature)
{ {
if (player->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10682) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Overseer, I am here to negotiate on behalf of the Cenarion Expedition.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Overseer, I am here to negotiate on behalf of the Cenarion Expedition.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(10532, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10532, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_overseer_nuaar(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_overseer_nuaar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+1) if (action == GOSSIP_ACTION_INFO_DEF+1)
{ {
player->SEND_GOSSIP_MENU(10533, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10533, _Creature->GetGUID());
player->AreaExploredOrEventHappens(10682); pPlayer->AreaExploredOrEventHappens(10682);
} }
return true; return true;
} }
@@ -305,27 +305,27 @@ bool GossipSelect_npc_overseer_nuaar(Player *player, Creature *_Creature, uint32
## npc_saikkal_the_elder ## npc_saikkal_the_elder
######*/ ######*/
bool GossipHello_npc_saikkal_the_elder(Player *player, Creature *_Creature) bool GossipHello_npc_saikkal_the_elder(Player* pPlayer, Creature *_Creature)
{ {
if (player->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10980) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes... yes, it's me.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes... yes, it's me.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(10794, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10794, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_saikkal_the_elder(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_saikkal_the_elder(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes elder. Tell me more of the book.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Yes elder. Tell me more of the book.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(10795, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10795, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID()); pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
player->SEND_GOSSIP_MENU(10796, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10796, _Creature->GetGUID());
break; break;
} }
return true; return true;
@@ -335,9 +335,9 @@ bool GossipSelect_npc_saikkal_the_elder(Player *player, Creature *_Creature, uin
## go_legion_obelisk ## go_legion_obelisk
######*/ ######*/
bool GOHello_go_legion_obelisk(Player *player, GameObject* _GO) bool GOHello_go_legion_obelisk(Player* pPlayer, GameObject* _GO)
{ {
if ( player->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE ) if (pPlayer->GetQuestStatus(10821) == QUEST_STATUS_INCOMPLETE)
{ {
switch(_GO->GetEntry()) switch(_GO->GetEntry())
{ {
src/bindings/scripts/scripts/zone/blasted_lands/blasted_lands.cpp
+39 -39
View File
@@ -38,22 +38,22 @@ EndContentData */
#define SPELL_TELEPORT_SINGLE_IN_GROUP 13142 #define SPELL_TELEPORT_SINGLE_IN_GROUP 13142
#define SPELL_TELEPORT_GROUP 27686 #define SPELL_TELEPORT_GROUP 27686
bool GossipHello_npc_deathly_usher(Player *player, Creature *_Creature) bool GossipHello_npc_deathly_usher(Player* pPlayer, Creature *_Creature)
{ {
if(player->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && player->HasItemCount(10757, 1)) if (pPlayer->GetQuestStatus(3628) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(10757, 1))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_USHER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_deathly_usher(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_deathly_usher(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF) if (action == GOSSIP_ACTION_INFO_DEF)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
_Creature->CastSpell(player, SPELL_TELEPORT_SINGLE, true); _Creature->CastSpell(pPlayer, SPELL_TELEPORT_SINGLE, true);
} }
return true; return true;
@@ -73,71 +73,71 @@ bool GossipSelect_npc_deathly_usher(Player *player, Creature *_Creature, uint32
#define GOSSIP_ITEM_FALLEN4 "You can count on me, Hero" #define GOSSIP_ITEM_FALLEN4 "You can count on me, Hero"
#define GOSSIP_ITEM_FALLEN5 "I shall" #define GOSSIP_ITEM_FALLEN5 "I shall"
bool GossipHello_npc_fallen_hero_of_horde(Player *player, Creature *_Creature) bool GossipHello_npc_fallen_hero_of_horde(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (player->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if (player->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && player->GetTeam() == HORDE) if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == HORDE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
if (player->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && player->GetTeam() == ALLIANCE) if (pPlayer->GetQuestStatus(2801) == QUEST_STATUS_INCOMPLETE && pPlayer->GetTeam() == ALLIANCE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_F1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_fallen_hero_of_horde(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_fallen_hero_of_horde(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
player->SEND_GOSSIP_MENU(1392, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1392, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+11: case GOSSIP_ACTION_INFO_DEF+11:
player->SEND_GOSSIP_MENU(1411, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1411, _Creature->GetGUID());
if (player->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(2784) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(2784); pPlayer->AreaExploredOrEventHappens(2784);
if (player->GetTeam() == ALLIANCE) if (pPlayer->GetTeam() == ALLIANCE)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(1411, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1411, _Creature->GetGUID());
} }
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
player->SEND_GOSSIP_MENU(1451, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1451, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+21: case GOSSIP_ACTION_INFO_DEF+21:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22);
player->SEND_GOSSIP_MENU(1452, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1452, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+22: case GOSSIP_ACTION_INFO_DEF+22:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 23);
player->SEND_GOSSIP_MENU(1453, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1453, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+23: case GOSSIP_ACTION_INFO_DEF+23:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 24);
player->SEND_GOSSIP_MENU(1454, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1454, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+24: case GOSSIP_ACTION_INFO_DEF+24:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 25);
player->SEND_GOSSIP_MENU(1455, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1455, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+25: case GOSSIP_ACTION_INFO_DEF+25:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FALLEN5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 26);
player->SEND_GOSSIP_MENU(1456, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1456, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+26: case GOSSIP_ACTION_INFO_DEF+26:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(2801); pPlayer->AreaExploredOrEventHappens(2801);
break; break;
} }
return true; return true;
src/bindings/scripts/scripts/zone/bloodmyst_isle/bloodmyst_isle.cpp
+18 -18
View File
@@ -79,46 +79,46 @@ CreatureAI* GetAI_mob_webbed_creature(Creature *_Creature)
#define C_SUNHAWK_TRIGGER 17974 #define C_SUNHAWK_TRIGGER 17974
bool GossipHello_npc_captured_sunhawk_agent(Player *player, Creature *_Creature) bool GossipHello_npc_captured_sunhawk_agent(Player* pPlayer, Creature *_Creature)
{ {
if (player->HasAura(31609) && player->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE) if (pPlayer->HasAura(31609) && pPlayer->GetQuestStatus(9756) == QUEST_STATUS_INCOMPLETE)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(9136, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9136, _Creature->GetGUID());
} }
else else
player->SEND_GOSSIP_MENU(9134, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9134, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_captured_sunhawk_agent(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_captured_sunhawk_agent(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(9137, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9137, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->SEND_GOSSIP_MENU(9138, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9138, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
player->SEND_GOSSIP_MENU(9139, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9139, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
player->SEND_GOSSIP_MENU(9140, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9140, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] ", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
player->SEND_GOSSIP_MENU(9141, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9141, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->TalkedToCreature(C_SUNHAWK_TRIGGER, _Creature->GetGUID()); pPlayer->TalkedToCreature(C_SUNHAWK_TRIGGER, _Creature->GetGUID());
break; break;
} }
return true; return true;
src/bindings/scripts/scripts/zone/borean_tundra/borean_tundra.cpp
+15 -15
View File
@@ -34,19 +34,19 @@ EndContentData */
#define GOSSIP_ITEM_TELEPORT "Teleport me to Amber Ledge, please." #define GOSSIP_ITEM_TELEPORT "Teleport me to Amber Ledge, please."
bool GossipHello_npc_tiare(Player *player, Creature *_Creature) bool GossipHello_npc_tiare(Player* pPlayer, Creature *_Creature)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_tiare(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_tiare(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_OPTION_GOSSIP) if (action == GOSSIP_OPTION_GOSSIP)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,50135,true); pPlayer->CastSpell(pPlayer,50135,true);
} }
return true; return true;
} }
@@ -58,31 +58,31 @@ bool GossipSelect_npc_tiare(Player *player, Creature *_Creature, uint32 sender,
#define GOSSIP_ITEM_FREE_FLIGHT "I'd like passage to the Transitus Shield." #define GOSSIP_ITEM_FREE_FLIGHT "I'd like passage to the Transitus Shield."
#define GOSSIP_ITEM_FLIGHT "May I use a drake to fly elsewhere?" #define GOSSIP_ITEM_FLIGHT "May I use a drake to fly elsewhere?"
bool GossipHello_npc_surristrasz(Player *player, Creature *_Creature) bool GossipHello_npc_surristrasz(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu(_Creature->GetGUID()); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (_Creature->isTaxi()) if (_Creature->isTaxi())
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FREE_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_FREE_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_GOSSIP);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_TAXIVENDOR); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_ITEM_FLIGHT, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_TAXIVENDOR);
} }
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_surristrasz(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_surristrasz(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_OPTION_GOSSIP) if (action == GOSSIP_OPTION_GOSSIP)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->CastSpell(player,46064,true); //TaxiPath 795 (amber to coldarra) pPlayer->CastSpell(pPlayer,46064,true); //TaxiPath 795 (amber to coldarra)
} }
if (action == GOSSIP_OPTION_TAXIVENDOR) if (action == GOSSIP_OPTION_TAXIVENDOR)
{ {
player->GetSession()->SendTaxiMenu(_Creature); pPlayer->GetSession()->SendTaxiMenu(_Creature);
} }
return true; return true;
} }
src/bindings/scripts/scripts/zone/burning_steppes/burning_steppes.cpp
+30 -30
View File
@@ -72,69 +72,69 @@ CreatureAI* GetAI_npc_ragged_john(Creature *_Creature)
return new npc_ragged_johnAI (_Creature); return new npc_ragged_johnAI (_Creature);
} }
bool GossipHello_npc_ragged_john(Player *player, Creature *_Creature) bool GossipHello_npc_ragged_john(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (player->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(4224) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(2713, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2713, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_ragged_john(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_ragged_john(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(2714, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2714, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(2715, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2715, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(2716, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2716, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->SEND_GOSSIP_MENU(2717, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2717, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
player->SEND_GOSSIP_MENU(2718, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2718, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
player->SEND_GOSSIP_MENU(2719, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2719, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
player->SEND_GOSSIP_MENU(2720, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2720, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+7: case GOSSIP_ACTION_INFO_DEF+7:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 8);
player->SEND_GOSSIP_MENU(2721, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2721, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+8: case GOSSIP_ACTION_INFO_DEF+8:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 9);
player->SEND_GOSSIP_MENU(2722, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2722, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+9: case GOSSIP_ACTION_INFO_DEF+9:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
player->SEND_GOSSIP_MENU(2723, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2723, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+10: case GOSSIP_ACTION_INFO_DEF+10:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
player->SEND_GOSSIP_MENU(2725, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2725, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+11: case GOSSIP_ACTION_INFO_DEF+11:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(4224); pPlayer->AreaExploredOrEventHappens(4224);
break; break;
} }
return true; return true;
src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
+3 -3
View File
@@ -3,12 +3,12 @@
struct TRINITY_DLL_DECL instance_culling_of_stratholme : public ScriptedInstance struct TRINITY_DLL_DECL instance_culling_of_stratholme : public ScriptedInstance
{ {
instance_culling_of_stratholme(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_culling_of_stratholme(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
}; };
InstanceData* GetInstanceData_instance_culling_of_stratholme(Map* map) InstanceData* GetInstanceData_instance_culling_of_stratholme(Map* pMap)
{ {
return new instance_culling_of_stratholme(map); return new instance_culling_of_stratholme(pMap);
} }
void AddSC_instance_culling_of_stratholme() void AddSC_instance_culling_of_stratholme()
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp
+12 -12
View File
@@ -354,34 +354,34 @@ CreatureAI* GetAI_npc_time_rift(Creature *_Creature)
#define SPELL_CHRONO_BEACON 34975 #define SPELL_CHRONO_BEACON 34975
#define ITEM_CHRONO_BEACON 24289 #define ITEM_CHRONO_BEACON 24289
bool GossipHello_npc_saat(Player *player, Creature *_Creature) bool GossipHello_npc_saat(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu(_Creature->GetGUID()); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (player->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(ITEM_CHRONO_BEACON,1)) if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1))
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(10000,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10000,_Creature->GetGUID());
return true; return true;
} }
else if (player->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !player->HasItemCount(ITEM_CHRONO_BEACON,1)) else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1))
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(10001,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10001,_Creature->GetGUID());
return true; return true;
} }
player->SEND_GOSSIP_MENU(10002,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(10002,_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_saat(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_saat(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+1) if (action == GOSSIP_ACTION_INFO_DEF+1)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
_Creature->CastSpell(player,SPELL_CHRONO_BEACON,false); _Creature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false);
} }
return true; return true;
} }
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp
+7 -7
View File
@@ -61,7 +61,7 @@ static Wave RiftWaves[]=
struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
{ {
instance_dark_portal(Map *map) : ScriptedInstance(map) {Initialize();}; instance_dark_portal(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint32 Encounter[ENCOUNTERS]; uint32 Encounter[ENCOUNTERS];
@@ -104,8 +104,8 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
{ {
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
if (Player* player = itr->getSource()) if (Player* pPlayer = itr->getSource())
player->SendUpdateWorldState(id,state); pPlayer->SendUpdateWorldState(id,state);
} }
}else debug_log("TSCR: Instance Black Portal: UpdateBMWorldState, but PlayerList is empty!"); }else debug_log("TSCR: Instance Black Portal: UpdateBMWorldState, but PlayerList is empty!");
} }
@@ -125,12 +125,12 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
return false; return false;
} }
void OnPlayerEnter(Player *player) void OnPlayerEnter(Player* pPlayer)
{ {
if (GetData(TYPE_MEDIVH) == IN_PROGRESS) if (GetData(TYPE_MEDIVH) == IN_PROGRESS)
return; return;
player->SendUpdateWorldState(WORLD_STATE_BM,0); pPlayer->SendUpdateWorldState(WORLD_STATE_BM,0);
} }
void OnCreatureCreate(Creature *creature, bool add) void OnCreatureCreate(Creature *creature, bool add)
@@ -347,9 +347,9 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_dark_portal(Map* map) InstanceData* GetInstanceData_instance_dark_portal(Map* pMap)
{ {
return new instance_dark_portal(map); return new instance_dark_portal(pMap);
} }
void AddSC_instance_dark_portal() void AddSC_instance_dark_portal()
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal.cpp
+30 -30
View File
@@ -64,7 +64,7 @@ CreatureAI* GetAI_npc_jaina_proudmoore(Creature *_Creature)
return ai; return ai;
} }
bool GossipHello_npc_jaina_proudmoore(Player *player, Creature *_Creature) bool GossipHello_npc_jaina_proudmoore(Player* pPlayer, Creature *_Creature)
{ {
hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
if (ai->EventBegun) if (ai->EventBegun)
@@ -73,31 +73,31 @@ bool GossipHello_npc_jaina_proudmoore(Player *player, Creature *_Creature)
uint32 RageEncounter = ai->GetInstanceData(DATA_RAGEWINTERCHILLEVENT); uint32 RageEncounter = ai->GetInstanceData(DATA_RAGEWINTERCHILLEVENT);
uint32 AnetheronEncounter = ai->GetInstanceData(DATA_ANETHERONEVENT); uint32 AnetheronEncounter = ai->GetInstanceData(DATA_ANETHERONEVENT);
if (RageEncounter == NOT_STARTED) if (RageEncounter == NOT_STARTED)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_ALLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_ALLY, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
else if (RageEncounter == DONE && AnetheronEncounter == NOT_STARTED) else if (RageEncounter == DONE && AnetheronEncounter == NOT_STARTED)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ANETHERON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ANETHERON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
else if (RageEncounter == DONE && AnetheronEncounter == DONE) else if (RageEncounter == DONE && AnetheronEncounter == DONE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
if(player->isGameMaster()) if (pPlayer->isGameMaster())
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(907, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_jaina_proudmoore(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_jaina_proudmoore(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
switch(action) switch(action)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
ai->StartEvent(player); ai->StartEvent(pPlayer);
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
ai->FirstBossDead = true; ai->FirstBossDead = true;
ai->WaveCount = 9; ai->WaveCount = 9;
ai->StartEvent(player); ai->StartEvent(pPlayer);
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
ai->Retreat(); ai->Retreat();
@@ -128,7 +128,7 @@ CreatureAI* GetAI_npc_thrall(Creature *_Creature)
return ai; return ai;
} }
bool GossipHello_npc_thrall(Player *player, Creature *_Creature) bool GossipHello_npc_thrall(Player* pPlayer, Creature *_Creature)
{ {
hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
if (ai->EventBegun) if (ai->EventBegun)
@@ -141,33 +141,33 @@ bool GossipHello_npc_thrall(Player *player, Creature *_Creature)
uint32 KazrogalEvent = ai->GetInstanceData(DATA_KAZROGALEVENT); uint32 KazrogalEvent = ai->GetInstanceData(DATA_KAZROGALEVENT);
uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT);
if (KazrogalEvent == NOT_STARTED) if (KazrogalEvent == NOT_STARTED)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_HORDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEGIN_HORDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
else if (KazrogalEvent == DONE && AzgalorEvent == NOT_STARTED) else if (KazrogalEvent == DONE && AzgalorEvent == NOT_STARTED)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AZGALOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AZGALOR, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
else if (AzgalorEvent == DONE) else if (AzgalorEvent == DONE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RETREAT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
} }
if(player->isGameMaster()) if (pPlayer->isGameMaster())
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, "[GM] Toggle Debug Timers", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(907, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_thrall(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_thrall(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
ai->DeSpawnVeins();//despawn the alliance veins ai->DeSpawnVeins();//despawn the alliance veins
switch(action) switch(action)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
ai->StartEvent(player); ai->StartEvent(pPlayer);
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
ai->FirstBossDead = true; ai->FirstBossDead = true;
ai->WaveCount = 9; ai->WaveCount = 9;
ai->StartEvent(player); ai->StartEvent(pPlayer);
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
ai->Retreat(); ai->Retreat();
@@ -188,31 +188,31 @@ CreatureAI* GetAI_npc_tyrande_whisperwind(Creature *_Creature)
return ai; return ai;
} }
bool GossipHello_npc_tyrande_whisperwind(Player* player, Creature* _Creature) bool GossipHello_npc_tyrande_whisperwind(Player* pPlayer, Creature* _Creature)
{ {
hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT);
// Only let them get item if Azgalor is dead. // Only let them get item if Azgalor is dead.
if (AzgalorEvent == DONE && !player->HasItemCount(ITEM_TEAR_OF_GODDESS,1)) if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS,1))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(907, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_tyrande_whisperwind(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_tyrande_whisperwind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF) if (action == GOSSIP_ACTION_INFO_DEF)
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_TEAR_OF_GODDESS, 1); uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_TEAR_OF_GODDESS, 1);
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
{ {
Item* item = player->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true); Item* item = pPlayer->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true);
if(item && player) if (item && pPlayer)
player->SendNewItem(item,1,true,false,true); pPlayer->SendNewItem(item,1,true,false,true);
} }
player->SEND_GOSSIP_MENU(907, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(907, _Creature->GetGUID());
hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI()); hyjalAI* ai = CAST_AI(hyjalAI, _Creature->AI());
} }
return true; return true;
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp
+8 -8
View File
@@ -571,9 +571,9 @@ void hyjalAI::SummonNextWave(Wave wave[18], uint32 Count, float Base[4][3])
CheckTimer = 5000; CheckTimer = 5000;
} }
void hyjalAI::StartEvent(Player* player) void hyjalAI::StartEvent(Player* pPlayer)
{ {
if(!player || IsDummy) if (!pPlayer || IsDummy)
return; return;
Talk(BEGIN); Talk(BEGIN);
@@ -583,7 +583,7 @@ void hyjalAI::StartEvent(Player* player)
NextWaveTimer = 15000; NextWaveTimer = 15000;
CheckTimer = 5000; CheckTimer = 5000;
PlayerGUID = player->GetGUID(); PlayerGUID = pPlayer->GetGUID();
m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -641,19 +641,19 @@ void hyjalAI::Talk(uint32 id)
void hyjalAI::UpdateWorldState(uint32 id, uint32 state) void hyjalAI::UpdateWorldState(uint32 id, uint32 state)
{ {
Map * map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
if(!map->IsDungeon()) if (!pMap->IsDungeon())
return; return;
Map::PlayerList const& players = map->GetPlayers(); Map::PlayerList const& players = pMap->GetPlayers();
if (!players.isEmpty()) if (!players.isEmpty())
{ {
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
if (Player* player = itr->getSource()) if (Player* pPlayer = itr->getSource())
player->SendUpdateWorldState(id,state); pPlayer->SendUpdateWorldState(id,state);
} }
}else debug_log("TSCR: HyjalAI: UpdateWorldState, but PlayerList is empty"); }else debug_log("TSCR: HyjalAI: UpdateWorldState, but PlayerList is empty");
} }
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/instance_hyjal.cpp
+8 -8
View File
@@ -41,7 +41,7 @@ enum
struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
{ {
instance_mount_hyjal(Map *map) : ScriptedInstance(map) {Initialize();}; instance_mount_hyjal(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint32 Encounters[ENCOUNTERS]; uint32 Encounters[ENCOUNTERS];
std::string str_data; std::string str_data;
@@ -179,11 +179,11 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
{ {
Creature* pUnit = pCreature->SummonCreature(21987,pCreature->GetPositionX(),pCreature->GetPositionY(),pCreature->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,10000); Creature* pUnit = pCreature->SummonCreature(21987,pCreature->GetPositionX(),pCreature->GetPositionY(),pCreature->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,10000);
Map *map = pCreature->GetMap(); Map* pMap = pCreature->GetMap();
if (map->IsDungeon() && pUnit) if (pMap->IsDungeon() && pUnit)
{ {
pUnit->SetVisibility(VISIBILITY_OFF); pUnit->SetVisibility(VISIBILITY_OFF);
Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList const &PlayerList = pMap->GetPlayers();
if (PlayerList.isEmpty()) if (PlayerList.isEmpty())
return; return;
@@ -291,8 +291,8 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
{ {
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
if (Player* player = itr->getSource()) if (Player* pPlayer = itr->getSource())
player->SendUpdateWorldState(id,state); pPlayer->SendUpdateWorldState(id,state);
} }
}else debug_log("TSCR: Instance Hyjal: UpdateWorldState, but PlayerList is empty!"); }else debug_log("TSCR: Instance Hyjal: UpdateWorldState, but PlayerList is empty!");
} }
@@ -320,9 +320,9 @@ struct TRINITY_DLL_DECL instance_mount_hyjal : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_mount_hyjal(Map* map) InstanceData* GetInstanceData_instance_mount_hyjal(Map* pMap)
{ {
return new instance_mount_hyjal(map); return new instance_mount_hyjal(pMap);
} }
void AddSC_instance_mount_hyjal() void AddSC_instance_mount_hyjal()
src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ EndScriptData */
## go_barrel_old_hillsbrad ## go_barrel_old_hillsbrad
######*/ ######*/
bool GOHello_go_barrel_old_hillsbrad(Player *player, GameObject* _GO) bool GOHello_go_barrel_old_hillsbrad(Player* pPlayer, GameObject* _GO)
{ {
ScriptedInstance* pInstance = _GO->GetInstanceData(); ScriptedInstance* pInstance = _GO->GetInstanceData();
src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+9 -9
View File
@@ -37,7 +37,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
{ {
instance_old_hillsbrad(Map *map) : ScriptedInstance(map) {Initialize();}; instance_old_hillsbrad(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint32 Encounter[ENCOUNTERS]; uint32 Encounter[ENCOUNTERS];
uint32 mBarrelCount; uint32 mBarrelCount;
@@ -84,12 +84,12 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
{ {
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
if (Player* player = itr->getSource()) if (Player* pPlayer = itr->getSource())
{ {
player->SendUpdateWorldState(WORLD_STATE_OH,mBarrelCount); pPlayer->SendUpdateWorldState(WORLD_STATE_OH,mBarrelCount);
if (mBarrelCount == 5) if (mBarrelCount == 5)
player->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0); pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0);
} }
} }
}else }else
@@ -114,9 +114,9 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
void SetData(uint32 type, uint32 data) void SetData(uint32 type, uint32 data)
{ {
Player *player = GetPlayerInMap(); Player* pPlayer = GetPlayerInMap();
if (!player) if (!pPlayer)
{ {
debug_log("TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data); debug_log("TSCR: Instance Old Hillsbrad: SetData (Type: %u Data %u) cannot find any player.", type, data);
return; return;
@@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
if (mBarrelCount == 5) if (mBarrelCount == 5)
{ {
player->SummonCreature(DRAKE_ENTRY,2128.43,71.01,64.42,1.74,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000); pPlayer->SummonCreature(DRAKE_ENTRY,2128.43,71.01,64.42,1.74,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000);
Encounter[0] = DONE; Encounter[0] = DONE;
} }
} }
@@ -228,9 +228,9 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
return 0; return 0;
} }
}; };
InstanceData* GetInstanceData_instance_old_hillsbrad(Map* map) InstanceData* GetInstanceData_instance_old_hillsbrad(Map* pMap)
{ {
return new instance_old_hillsbrad(map); return new instance_old_hillsbrad(pMap);
} }
void AddSC_instance_old_hillsbrad() void AddSC_instance_old_hillsbrad()
src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
+38 -38
View File
@@ -41,38 +41,38 @@ EndContentData */
## npc_erozion ## npc_erozion
######*/ ######*/
bool GossipHello_npc_erozion(Player *player, Creature *_Creature) bool GossipHello_npc_erozion(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
ScriptedInstance* pInstance = (_Creature->GetInstanceData()); ScriptedInstance* pInstance = (_Creature->GetInstanceData());
if( pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !player->HasItemCount(ITEM_ENTRY_BOMBS,1) ) if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS,1))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need a pack of Incendiary Bombs.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I need a pack of Incendiary Bombs.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
if( !player->GetQuestRewardStatus(QUEST_ENTRY_RETURN) && player->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE ) if (!pPlayer->GetQuestRewardStatus(QUEST_ENTRY_RETURN) && pPlayer->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Teleport please, i'm tired.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Teleport please, i'm tired.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(9778, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9778, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_erozion(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_erozion(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+1) if (action == GOSSIP_ACTION_INFO_DEF+1)
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_ENTRY_BOMBS, 1); uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, ITEM_ENTRY_BOMBS, 1);
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
{ {
player->StoreNewItem(dest, ITEM_ENTRY_BOMBS, true); pPlayer->StoreNewItem(dest, ITEM_ENTRY_BOMBS, true);
} }
player->SEND_GOSSIP_MENU(9515, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9515, _Creature->GetGUID());
} }
if (action == GOSSIP_ACTION_INFO_DEF+2) if (action == GOSSIP_ACTION_INFO_DEF+2)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
} }
return true; return true;
} }
@@ -340,9 +340,9 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
} }
//kill credit creature for quest //kill credit creature for quest
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
Map::PlayerList const& players = map->GetPlayers(); Map::PlayerList const& players = pMap->GetPlayers();
if (!players.isEmpty() && map->IsDungeon()) if (!players.isEmpty() && pMap->IsDungeon())
{ {
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{ {
@@ -490,12 +490,12 @@ CreatureAI* GetAI_npc_thrall_old_hillsbrad(Creature *_Creature)
return thrall_walkAI; return thrall_walkAI;
} }
bool GossipHello_npc_thrall_old_hillsbrad(Player *player, Creature *_Creature) bool GossipHello_npc_thrall_old_hillsbrad(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
{ {
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
player->SendPreparedQuest(_Creature->GetGUID()); pPlayer->SendPreparedQuest(_Creature->GetGUID());
} }
ScriptedInstance* pInstance = (_Creature->GetInstanceData()); ScriptedInstance* pInstance = (_Creature->GetInstanceData());
@@ -503,32 +503,32 @@ bool GossipHello_npc_thrall_old_hillsbrad(Player *player, Creature *_Creature)
{ {
if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE && !pInstance->GetData(TYPE_THRALL_EVENT)) if (pInstance->GetData(TYPE_BARREL_DIVERSION) == DONE && !pInstance->GetData(TYPE_THRALL_EVENT))
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Start walking.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "[PH] Start walking.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(GOSSIP_ID_START, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_START, _Creature->GetGUID());
} }
if (pInstance->GetData(TYPE_THRALL_PART1) == DONE && !pInstance->GetData(TYPE_THRALL_PART2)) if (pInstance->GetData(TYPE_THRALL_PART1) == DONE && !pInstance->GetData(TYPE_THRALL_PART2))
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC1, _Creature->GetGUID());
} }
if (pInstance->GetData(TYPE_THRALL_PART2) == DONE && !pInstance->GetData(TYPE_THRALL_PART3)) if (pInstance->GetData(TYPE_THRALL_PART2) == DONE && !pInstance->GetData(TYPE_THRALL_PART3))
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TARREN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_TARREN, _Creature->GetGUID());
} }
} }
return true; return true;
} }
bool GossipSelect_npc_thrall_old_hillsbrad(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
ScriptedInstance* pInstance = (_Creature->GetInstanceData()); ScriptedInstance* pInstance = (_Creature->GetInstanceData());
switch(action) switch(action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
if (pInstance) if (pInstance)
{ {
pInstance->SetData(TYPE_THRALL_EVENT,IN_PROGRESS); pInstance->SetData(TYPE_THRALL_EVENT,IN_PROGRESS);
@@ -537,19 +537,19 @@ bool GossipSelect_npc_thrall_old_hillsbrad(Player *player, Creature *_Creature,
DoScriptText(SAY_TH_START_EVENT_PART1, _Creature); DoScriptText(SAY_TH_START_EVENT_PART1, _Creature);
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, true, player->GetGUID()); CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, true, pPlayer->GetGUID());
CAST_AI(npc_escortAI, (_Creature->AI()))->SetMaxPlayerDistance(100.0f);//not really needed, because it will not despawn if player is too far CAST_AI(npc_escortAI, (_Creature->AI()))->SetMaxPlayerDistance(100.0f);//not really needed, because it will not despawn if player is too far
CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtEnd(false); CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtEnd(false);
CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtFar(false); CAST_AI(npc_escortAI, (_Creature->AI()))->SetDespawnAtFar(false);
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_SKARLOC2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20);
player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC2, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+20: case GOSSIP_ACTION_INFO_DEF+20:
player->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, _Creature->GetGUID());
_Creature->SummonCreature(SKARLOC_MOUNT,2038.81,270.26,63.20,5.41,TEMPSUMMON_TIMED_DESPAWN,12000); _Creature->SummonCreature(SKARLOC_MOUNT,2038.81,270.26,63.20,5.41,TEMPSUMMON_TIMED_DESPAWN,12000);
if (pInstance) if (pInstance)
pInstance->SetData(TYPE_THRALL_PART2,IN_PROGRESS); pInstance->SetData(TYPE_THRALL_PART2,IN_PROGRESS);
@@ -560,7 +560,7 @@ bool GossipSelect_npc_thrall_old_hillsbrad(Player *player, Creature *_Creature,
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
if (pInstance) if (pInstance)
pInstance->SetData(TYPE_THRALL_PART3,IN_PROGRESS); pInstance->SetData(TYPE_THRALL_PART3,IN_PROGRESS);
CAST_AI(npc_thrall_old_hillsbradAI, _Creature->AI())->StartWP(); CAST_AI(npc_thrall_old_hillsbradAI, _Creature->AI())->StartWP();
@@ -616,28 +616,28 @@ CreatureAI* GetAI_npc_taretha(Creature *_Creature)
return taretha_walkAI; return taretha_walkAI;
} }
bool GossipHello_npc_taretha(Player *player, Creature *_Creature) bool GossipHello_npc_taretha(Player* pPlayer, Creature *_Creature)
{ {
ScriptedInstance* pInstance = (_Creature->GetInstanceData()); ScriptedInstance* pInstance = (_Creature->GetInstanceData());
if (pInstance && pInstance->GetData(TYPE_THRALL_PART3) == DONE && pInstance->GetData(TYPE_THRALL_PART4) == NOT_STARTED) if (pInstance && pInstance->GetData(TYPE_THRALL_PART3) == DONE && pInstance->GetData(TYPE_THRALL_PART4) == NOT_STARTED)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH1, _Creature->GetGUID());
} }
return true; return true;
} }
bool GossipSelect_npc_taretha(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_taretha(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
ScriptedInstance* pInstance = (_Creature->GetInstanceData()); ScriptedInstance* pInstance = (_Creature->GetInstanceData());
if (action == GOSSIP_ACTION_INFO_DEF+1) if (action == GOSSIP_ACTION_INFO_DEF+1)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_EPOCH2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_EPOCH2, _Creature->GetGUID());
} }
if (action == GOSSIP_ACTION_INFO_DEF+2) if (action == GOSSIP_ACTION_INFO_DEF+2)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
if (pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) if (pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS)
{ {
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+10 -10
View File
@@ -250,8 +250,8 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
if (pInstance) if (pInstance)
{ {
//remove old tainted cores to prevent cheating in phase 2 //remove old tainted cores to prevent cheating in phase 2
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList const &PlayerList = pMap->GetPlayers();
for(Map::PlayerList::const_iterator i = PlayerList.begin();i != PlayerList.end(); ++i) for(Map::PlayerList::const_iterator i = PlayerList.begin();i != PlayerList.end(); ++i)
{ {
if (Player* i_pl = i->getSource()) if (Player* i_pl = i->getSource())
@@ -922,18 +922,18 @@ struct TRINITY_DLL_DECL mob_shield_generator_channelAI : public ScriptedAI
} }
}; };
bool ItemUse_item_tainted_core(Player *player, Item* _Item, SpellCastTargets const& targets) bool ItemUse_item_tainted_core(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
{ {
ScriptedInstance *pInstance = (player->GetInstanceData()) ? (player->GetInstanceData()) : NULL; ScriptedInstance *pInstance = (pPlayer->GetInstanceData()) ? (pPlayer->GetInstanceData()) : NULL;
if (!pInstance) if (!pInstance)
{ {
player->GetSession()->SendNotification("Instance script not initialized"); pPlayer->GetSession()->SendNotification("Instance script not initialized");
return true; return true;
} }
Creature *Vashj = NULL; Creature *Vashj = NULL;
Vashj = (Unit::GetCreature((*player), pInstance->GetData64(DATA_LADYVASHJ))); Vashj = (Unit::GetCreature((*pPlayer), pInstance->GetData64(DATA_LADYVASHJ)));
if (Vashj && CAST_AI(boss_lady_vashjAI, Vashj->AI())->Phase == 2) if (Vashj && CAST_AI(boss_lady_vashjAI, Vashj->AI())->Phase == 2)
{ {
if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId()==TYPEID_GAMEOBJECT) if (targets.getGOTarget() && targets.getGOTarget()->GetTypeId()==TYPEID_GAMEOBJECT)
@@ -964,7 +964,7 @@ bool ItemUse_item_tainted_core(Player *player, Item* _Item, SpellCastTargets con
if (pInstance->GetData(identifier)) if (pInstance->GetData(identifier))
{ {
player->GetSession()->SendNotification("Already deactivated"); pPlayer->GetSession()->SendNotification("Already deactivated");
return true; return true;
} }
@@ -980,15 +980,15 @@ bool ItemUse_item_tainted_core(Player *player, Item* _Item, SpellCastTargets con
pInstance->SetData(identifier, 1); pInstance->SetData(identifier, 1);
//remove this item //remove this item
player->DestroyItemCount(31088, 1, true); pPlayer->DestroyItemCount(31088, 1, true);
return true; return true;
} }
else if (targets.getUnitTarget()->GetTypeId() == TYPEID_UNIT) else if (targets.getUnitTarget()->GetTypeId() == TYPEID_UNIT)
return false; return false;
else if (targets.getUnitTarget()->GetTypeId() == TYPEID_PLAYER) else if (targets.getUnitTarget()->GetTypeId() == TYPEID_PLAYER)
{ {
player->DestroyItemCount(31088, 1, true); pPlayer->DestroyItemCount(31088, 1, true);
player->CastSpell(targets.getUnitTarget(), 38134, true); pPlayer->CastSpell(targets.getUnitTarget(), 38134, true);
return true; return true;
} }
} }
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
+2 -2
View File
@@ -737,8 +737,8 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI
if (Earthshock_Timer < diff) if (Earthshock_Timer < diff)
{ {
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList const &PlayerList = pMap->GetPlayers();
for(Map::PlayerList::const_iterator itr = PlayerList.begin();itr != PlayerList.end(); ++itr) for(Map::PlayerList::const_iterator itr = PlayerList.begin();itr != PlayerList.end(); ++itr)
{ {
if (Player* i_pl = itr->getSource()) if (Player* i_pl = itr->getSource())
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
+6 -6
View File
@@ -221,10 +221,10 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
SpoutAnimTimer = 1000; SpoutAnimTimer = 1000;
}else SpoutAnimTimer-=diff; }else SpoutAnimTimer-=diff;
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
if (map->IsDungeon() && pInstance->GetData(DATA_THELURKERBELOWEVENT) == IN_PROGRESS) if (pMap->IsDungeon() && pInstance->GetData(DATA_THELURKERBELOWEVENT) == IN_PROGRESS)
{ {
Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList const &PlayerList = pMap->GetPlayers();
for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{ {
Player *target = i->getSource(); Player *target = i->getSource();
@@ -257,10 +257,10 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
return; return;
//Check if players in water and if in water cast spell //Check if players in water and if in water cast spell
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
if (map->IsDungeon() && pInstance->GetData(DATA_THELURKERBELOWEVENT) == IN_PROGRESS) if (pMap->IsDungeon() && pInstance->GetData(DATA_THELURKERBELOWEVENT) == IN_PROGRESS)
{ {
Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList const &PlayerList = pMap->GetPlayers();
if (PlayerList.isEmpty()) if (PlayerList.isEmpty())
return; return;
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
+5 -5
View File
@@ -168,14 +168,14 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
StartEvent(); StartEvent();
} }
void ApplyWateryGrave(Unit *player, uint8 i) void ApplyWateryGrave(Unit* pPlayer, uint8 i)
{ {
switch(i) switch(i)
{ {
case 0: player->CastSpell(player, SPELL_WATERY_GRAVE_1, true); break; case 0: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_1, true); break;
case 1: player->CastSpell(player, SPELL_WATERY_GRAVE_2, true); break; case 1: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_2, true); break;
case 2: player->CastSpell(player, SPELL_WATERY_GRAVE_3, true); break; case 2: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_3, true); break;
case 3: player->CastSpell(player, SPELL_WATERY_GRAVE_4, true); break; case 3: pPlayer->CastSpell(pPlayer, SPELL_WATERY_GRAVE_4, true); break;
} }
} }
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
+4 -4
View File
@@ -35,7 +35,7 @@ EndScriptData */
5 - Lady Vashj Event 5 - Lady Vashj Event
*/ */
bool GOHello_go_bridge_console(Player *player, GameObject* go) bool GOHello_go_bridge_console(Player* pPlayer, GameObject* go)
{ {
ScriptedInstance* pInstance = go->GetInstanceData(); ScriptedInstance* pInstance = go->GetInstanceData();
@@ -50,7 +50,7 @@ bool GOHello_go_bridge_console(Player *player, GameObject* go)
struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
{ {
instance_serpentshrine_cavern(Map *map) : ScriptedInstance(map) {Initialize();}; instance_serpentshrine_cavern(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint64 LurkerBelow; uint64 LurkerBelow;
uint64 Sharkkis; uint64 Sharkkis;
@@ -264,9 +264,9 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_serpentshrine_cavern(Map* map) InstanceData* GetInstanceData_instance_serpentshrine_cavern(Map* pMap)
{ {
return new instance_serpentshrine_cavern(map); return new instance_serpentshrine_cavern(pMap);
} }
void AddSC_instance_serpentshrine_cavern() void AddSC_instance_serpentshrine_cavern()
src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
+4 -4
View File
@@ -36,7 +36,7 @@ EndScriptData */
3 - Warlord Kalithresh Event 3 - Warlord Kalithresh Event
*/ */
bool GOHello_go_main_chambers_access_panel(Player *player, GameObject* _GO) bool GOHello_go_main_chambers_access_panel(Player* pPlayer, GameObject* _GO)
{ {
ScriptedInstance* pInstance = _GO->GetInstanceData(); ScriptedInstance* pInstance = _GO->GetInstanceData();
@@ -54,7 +54,7 @@ bool GOHello_go_main_chambers_access_panel(Player *player, GameObject* _GO)
struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance
{ {
instance_steam_vault(Map *map) : ScriptedInstance(map) {Initialize();}; instance_steam_vault(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint32 Encounter[ENCOUNTERS]; uint32 Encounter[ENCOUNTERS];
@@ -210,9 +210,9 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_steam_vault(Map* map) InstanceData* GetInstanceData_instance_steam_vault(Map* pMap)
{ {
return new instance_steam_vault(map); return new instance_steam_vault(pMap);
} }
void AddSC_instance_steam_vault() void AddSC_instance_steam_vault()
src/bindings/scripts/scripts/zone/deadmines/deadmines.cpp
+7 -7
View File
@@ -41,7 +41,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
{ {
instance_deadmines(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_deadmines(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
GameObject* IronCladDoor; GameObject* IronCladDoor;
GameObject* DefiasCannon; GameObject* DefiasCannon;
@@ -194,13 +194,13 @@ struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
# item_Defias_Gunpowder # item_Defias_Gunpowder
#####*/ #####*/
bool ItemUse_item_defias_gunpowder(Player *player, Item* _Item, SpellCastTargets const& targets) bool ItemUse_item_defias_gunpowder(Player* pPlayer, Item* _Item, SpellCastTargets const& targets)
{ {
ScriptedInstance *pInstance = (player->GetInstanceData()) ? (player->GetInstanceData()) : NULL; ScriptedInstance *pInstance = (pPlayer->GetInstanceData()) ? (pPlayer->GetInstanceData()) : NULL;
if (!pInstance) if (!pInstance)
{ {
player->GetSession()->SendNotification("Instance script not initialized"); pPlayer->GetSession()->SendNotification("Instance script not initialized");
return true; return true;
} }
if (pInstance->GetData(EVENT_STATE)!= CANNON_NOT_USED) if (pInstance->GetData(EVENT_STATE)!= CANNON_NOT_USED)
@@ -211,13 +211,13 @@ bool ItemUse_item_defias_gunpowder(Player *player, Item* _Item, SpellCastTargets
pInstance->SetData(EVENT_STATE, CANNON_GUNPOWDER_USED); pInstance->SetData(EVENT_STATE, CANNON_GUNPOWDER_USED);
} }
player->DestroyItemCount(_Item->GetEntry(), 1, true); pPlayer->DestroyItemCount(_Item->GetEntry(), 1, true);
return true; return true;
} }
InstanceData* GetInstanceData_instance_deadmines(Map* map) InstanceData* GetInstanceData_instance_deadmines(Map* pMap)
{ {
return new instance_deadmines(map); return new instance_deadmines(pMap);
} }
void AddSC_instance_deadmines() void AddSC_instance_deadmines()
src/bindings/scripts/scripts/zone/draktharon_keep/instance_drak_tharon_keep.cpp
+3 -3
View File
@@ -3,12 +3,12 @@
struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance struct TRINITY_DLL_DECL instance_drak_tharon : public ScriptedInstance
{ {
instance_drak_tharon(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_drak_tharon(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
}; };
InstanceData* GetInstanceData_instance_drak_tharon(Map* map) InstanceData* GetInstanceData_instance_drak_tharon(Map* pMap)
{ {
return new instance_drak_tharon(map); return new instance_drak_tharon(pMap);
} }
void AddSC_instance_drak_tharon() void AddSC_instance_drak_tharon()
src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp
+23 -23
View File
@@ -92,11 +92,11 @@ CreatureAI* GetAI_mobs_risen_husk_spirit(Creature *_Creature)
## npc_restless_apparition ## npc_restless_apparition
######*/ ######*/
bool GossipHello_npc_restless_apparition(Player *player, Creature *_Creature) bool GossipHello_npc_restless_apparition(Player* pPlayer, Creature *_Creature)
{ {
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
player->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID()); pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
_Creature->SetInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); _Creature->SetInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
return true; return true;
@@ -123,15 +123,15 @@ CreatureAI* GetAI_npc_deserter_agitator(Creature *_Creature)
return new npc_deserter_agitatorAI (_Creature); return new npc_deserter_agitatorAI (_Creature);
} }
bool GossipHello_npc_deserter_agitator(Player *player, Creature *_Creature) bool GossipHello_npc_deserter_agitator(Player* pPlayer, Creature *_Creature)
{ {
if (player->GetQuestStatus(11126) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(11126) == QUEST_STATUS_INCOMPLETE)
{ {
_Creature->setFaction(1883); _Creature->setFaction(1883);
player->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID()); pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
} }
else else
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
@@ -142,25 +142,25 @@ bool GossipHello_npc_deserter_agitator(Player *player, Creature *_Creature)
#define GOSSIP_ITEM_JAINA "I know this is rather silly but i have a young ward who is a bit shy and would like your autograph." #define GOSSIP_ITEM_JAINA "I know this is rather silly but i have a young ward who is a bit shy and would like your autograph."
bool GossipHello_npc_lady_jaina_proudmoore(Player *player, Creature *_Creature) bool GossipHello_npc_lady_jaina_proudmoore(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if( player->GetQuestStatus(558) == QUEST_STATUS_INCOMPLETE ) if (pPlayer->GetQuestStatus(558) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO ); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_JAINA, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_lady_jaina_proudmoore(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_lady_jaina_proudmoore(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_SENDER_INFO) if (action == GOSSIP_SENDER_INFO)
{ {
player->SEND_GOSSIP_MENU( 7012, _Creature->GetGUID() ); pPlayer->SEND_GOSSIP_MENU(7012, _Creature->GetGUID());
player->CastSpell( player, 23122, false); pPlayer->CastSpell(pPlayer, 23122, false);
} }
return true; return true;
} }
@@ -169,26 +169,26 @@ bool GossipSelect_npc_lady_jaina_proudmoore(Player *player, Creature *_Creature,
## npc_nat_pagle ## npc_nat_pagle
######*/ ######*/
bool GossipHello_npc_nat_pagle(Player *player, Creature *_Creature) bool GossipHello_npc_nat_pagle(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if(_Creature->isVendor() && player->GetQuestRewardStatus(8227)) if (_Creature->isVendor() && pPlayer->GetQuestRewardStatus(8227))
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
player->SEND_GOSSIP_MENU( 7640, _Creature->GetGUID() ); pPlayer->SEND_GOSSIP_MENU(7640, _Creature->GetGUID());
} }
else else
player->SEND_GOSSIP_MENU( 7638, _Creature->GetGUID() ); pPlayer->SEND_GOSSIP_MENU(7638, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_nat_pagle(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_nat_pagle(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_TRADE) if (action == GOSSIP_ACTION_TRADE)
player->SEND_VENDORLIST( _Creature->GetGUID() ); pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
return true; return true;
} }
src/bindings/scripts/scripts/zone/eastern_plaguelands/eastern_plaguelands.cpp
+24 -24
View File
@@ -58,22 +58,22 @@ CreatureAI* GetAI_mobs_ghoul_flayer(Creature *_Creature)
## npc_augustus_the_touched ## npc_augustus_the_touched
######*/ ######*/
bool GossipHello_npc_augustus_the_touched(Player *player, Creature *_Creature) bool GossipHello_npc_augustus_the_touched(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if( _Creature->isVendor() && player->GetQuestRewardStatus(6164) ) if (_Creature->isVendor() && pPlayer->GetQuestRewardStatus(6164))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_augustus_the_touched(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_augustus_the_touched(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_TRADE) if (action == GOSSIP_ACTION_TRADE)
player->SEND_VENDORLIST( _Creature->GetGUID() ); pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
return true; return true;
} }
@@ -101,10 +101,10 @@ CreatureAI* GetAI_npc_darrowshire_spirit(Creature *_Creature)
return new npc_darrowshire_spiritAI (_Creature); return new npc_darrowshire_spiritAI (_Creature);
} }
bool GossipHello_npc_darrowshire_spirit(Player *player, Creature *_Creature) bool GossipHello_npc_darrowshire_spirit(Player* pPlayer, Creature *_Creature)
{ {
player->SEND_GOSSIP_MENU(3873,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(3873,_Creature->GetGUID());
player->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID()); pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
_Creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); _Creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
return true; return true;
} }
@@ -113,38 +113,38 @@ bool GossipHello_npc_darrowshire_spirit(Player *player, Creature *_Creature)
## npc_tirion_fordring ## npc_tirion_fordring
######*/ ######*/
bool GossipHello_npc_tirion_fordring(Player *player, Creature *_Creature) bool GossipHello_npc_tirion_fordring(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (player->GetQuestStatus(5742) == QUEST_STATUS_INCOMPLETE && player->getStandState() == UNIT_STAND_STATE_SIT ) if (pPlayer->GetQuestStatus(5742) == QUEST_STATUS_INCOMPLETE && pPlayer->getStandState() == UNIT_STAND_STATE_SIT)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready to hear your tale, Tirion.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I am ready to hear your tale, Tirion.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_tirion_fordring(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_tirion_fordring(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thank you, Tirion. What of your identity?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Thank you, Tirion. What of your identity?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(4493, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4493, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "That is terrible.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "That is terrible.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(4494, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4494, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will, Tirion.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "I will, Tirion.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->SEND_GOSSIP_MENU(4495, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4495, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(5742); pPlayer->AreaExploredOrEventHappens(5742);
break; break;
} }
return true; return true;
src/bindings/scripts/scripts/zone/eastern_plaguelands/the_scarlet_enclave.cpp
+3 -3
View File
@@ -932,12 +932,12 @@ CreatureAI* GetAI_npc_unworthy_initiate_anchor(Creature *_Creature)
return new npc_unworthy_initiate_anchorAI(_Creature); return new npc_unworthy_initiate_anchorAI(_Creature);
} }
bool GOHello_go_acherus_soul_prison(Player *player, GameObject* go) bool GOHello_go_acherus_soul_prison(Player* pPlayer, GameObject* go)
{ {
if (Creature *anchor = go->FindNearestCreature(29521, 15)) if (Creature *anchor = go->FindNearestCreature(29521, 15))
if (uint64 prisonerGUID = anchor->AI()->GetGUID()) if (uint64 prisonerGUID = anchor->AI()->GetGUID())
if(Creature* prisoner = Creature::GetCreature(*player, prisonerGUID)) if (Creature* prisoner = Creature::GetCreature(*pPlayer, prisonerGUID))
CAST_AI(npc_unworthy_initiateAI, (prisoner->AI()))->EventStart(anchor, player); CAST_AI(npc_unworthy_initiateAI, (prisoner->AI()))->EventStart(anchor, pPlayer);
return false; return false;
} }
src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp
+34 -34
View File
@@ -52,15 +52,15 @@ struct TRINITY_DLL_DECL npc_prospector_anvilwardAI : public npc_escortAI
// Pure Virtual Functions // Pure Virtual Functions
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(!player) if (!pPlayer)
return; return;
switch (i) switch (i)
{ {
case 0: DoScriptText(SAY_PR_1, m_creature, player); break; case 0: DoScriptText(SAY_PR_1, m_creature, pPlayer); break;
case 5: DoScriptText(SAY_PR_2, m_creature, player); break; case 5: DoScriptText(SAY_PR_2, m_creature, pPlayer); break;
case 6: m_creature->setFaction(24); break; case 6: m_creature->setFaction(24); break;
} }
} }
@@ -92,26 +92,26 @@ CreatureAI* GetAI_npc_prospector_anvilward(Creature* pCreature)
return thisAI; return thisAI;
} }
bool GossipHello_npc_prospector_anvilward(Player *player, Creature *_Creature) bool GossipHello_npc_prospector_anvilward(Player* pPlayer, Creature *_Creature)
{ {
if( player->GetQuestStatus(QUEST_THE_DWARVEN_SPY) == QUEST_STATUS_INCOMPLETE ) if (pPlayer->GetQuestStatus(QUEST_THE_DWARVEN_SPY) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(8239, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(8239, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_prospector_anvilward(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_prospector_anvilward(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch(action) switch(action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(8240, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(8240, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, false, player->GetGUID()); CAST_AI(npc_escortAI, (_Creature->AI()))->Start(true, false, pPlayer->GetGUID());
break; break;
} }
return true; return true;
@@ -378,7 +378,7 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI
void StartEvent() void StartEvent()
{ {
if ( questPhase == 1 ) { // no player check, quest can be finished as group, so no complex playerguid/group search code if (questPhase == 1) { // no player check, quest can be finished as group, so no complex PlayerGUID/group search code
for (int i = 0; i<4; ++i) { for (int i = 0; i<4; ++i) {
Creature* Summoned; Creature* Summoned;
@@ -398,7 +398,7 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI
}; };
bool GossipHello_master_kelerun_bloodmourn(Player *player, Creature *_Creature) bool GossipHello_master_kelerun_bloodmourn(Player* pPlayer, Creature *_Creature)
{ {
// quest only available if not already started // quest only available if not already started
// Quest_template flag is set to : QUEST_FLAGS_EVENT // Quest_template flag is set to : QUEST_FLAGS_EVENT
@@ -406,15 +406,15 @@ bool GossipHello_master_kelerun_bloodmourn(Player *player, Creature *_Creature)
// !not sure if this really works! // !not sure if this really works!
if (CAST_AI(master_kelerun_bloodmournAI, _Creature->AI())->questPhase == 0) { if (CAST_AI(master_kelerun_bloodmournAI, _Creature->AI())->questPhase == 0) {
player->PrepareQuestMenu(_Creature->GetGUID()); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
player->SendPreparedQuest(_Creature->GetGUID()); pPlayer->SendPreparedQuest(_Creature->GetGUID());
} }
player->SEND_GOSSIP_MENU(_Creature->GetEntry(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetEntry(), _Creature->GetGUID());
return true; return true;
} }
bool QuestAccept_master_kelerun_bloodmourn(Player *player, Creature *creature, Quest const *quest ) bool QuestAccept_master_kelerun_bloodmourn(Player* pPlayer, Creature *creature, Quest const *quest)
{ {
// One Player exclusive quest, wait for user go activation // One Player exclusive quest, wait for user go activation
if (quest->GetQuestId() == QUEST_SECOND_TRIAL) if (quest->GetQuestId() == QUEST_SECOND_TRIAL)
@@ -497,7 +497,7 @@ CreatureAI* GetAI_npc_secondTrial(Creature *_Creature)
## go_second_trial ## go_second_trial
######*/ ######*/
bool GOHello_go_second_trial(Player *player, GameObject* pGO) bool GOHello_go_second_trial(Player* pPlayer, GameObject* pGO)
{ {
// find spawn :: master_kelerun_bloodmourn // find spawn :: master_kelerun_bloodmourn
if (Creature* pCreature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f)) if (Creature* pCreature = pGO->FindNearestCreature(MASTER_KELERUN_BLOODMOURN, 30.0f))
@@ -549,9 +549,9 @@ struct TRINITY_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI
{ {
if (PlayerGUID) if (PlayerGUID)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (player) if (pPlayer)
CAST_PLR(player)->FailQuest(QUEST_UNEXPECTED_RESULT); CAST_PLR(pPlayer)->FailQuest(QUEST_UNEXPECTED_RESULT);
} }
} }
@@ -561,9 +561,9 @@ struct TRINITY_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI
{ {
if (PlayerGUID) if (PlayerGUID)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(player) if (pPlayer)
CAST_PLR(player)->CompleteQuest(QUEST_UNEXPECTED_RESULT); CAST_PLR(pPlayer)->CompleteQuest(QUEST_UNEXPECTED_RESULT);
} }
} }
@@ -577,12 +577,12 @@ struct TRINITY_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI
} }
}; };
bool QuestAccept_npc_apprentice_mirveda(Player* player, Creature* creature, Quest const* quest) bool QuestAccept_npc_apprentice_mirveda(Player* pPlayer, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_UNEXPECTED_RESULT) if (quest->GetQuestId() == QUEST_UNEXPECTED_RESULT)
{ {
CAST_AI(npc_apprentice_mirvedaAI, creature->AI())->Summon = true; CAST_AI(npc_apprentice_mirvedaAI, creature->AI())->Summon = true;
CAST_AI(npc_apprentice_mirvedaAI, creature->AI())->PlayerGUID = player->GetGUID(); CAST_AI(npc_apprentice_mirvedaAI, creature->AI())->PlayerGUID = pPlayer->GetGUID();
} }
return true; return true;
} }
@@ -659,9 +659,9 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI
{ {
if (PlayerGUID && !Completed) if (PlayerGUID && !Completed)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (player) if (pPlayer)
CAST_PLR(player)->FailQuest(QUEST_POWERING_OUR_DEFENSES); CAST_PLR(pPlayer)->FailQuest(QUEST_POWERING_OUR_DEFENSES);
} }
} }
@@ -673,9 +673,9 @@ struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI
Completed = true; Completed = true;
if (PlayerGUID) if (PlayerGUID)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(player) if (pPlayer)
CAST_PLR(player)->CompleteQuest(QUEST_POWERING_OUR_DEFENSES); CAST_PLR(pPlayer)->CompleteQuest(QUEST_POWERING_OUR_DEFENSES);
} }
m_creature->DealDamage(m_creature,m_creature->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); m_creature->DealDamage(m_creature,m_creature->GetHealth(),NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
m_creature->RemoveCorpse(); m_creature->RemoveCorpse();
src/bindings/scripts/scripts/zone/felwood/felwood.cpp
+17 -17
View File
@@ -33,46 +33,46 @@ EndContentData */
#define GOSSIP_ITEM_BEACON "Please make me a Cenarion Beacon" #define GOSSIP_ITEM_BEACON "Please make me a Cenarion Beacon"
bool GossipHello_npcs_riverbreeze_and_silversky(Player *player, Creature *_Creature) bool GossipHello_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature *_Creature)
{ {
uint32 eCreature = _Creature->GetEntry(); uint32 eCreature = _Creature->GetEntry();
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (eCreature==9528) if (eCreature==9528)
{ {
if( player->GetQuestRewardStatus(4101) ) if (pPlayer->GetQuestRewardStatus(4101))
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(2848, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2848, _Creature->GetGUID());
}else if( player->GetTeam()==HORDE ) }else if (pPlayer->GetTeam()==HORDE)
player->SEND_GOSSIP_MENU(2845, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2845, _Creature->GetGUID());
else else
player->SEND_GOSSIP_MENU(2844, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2844, _Creature->GetGUID());
} }
if (eCreature==9529) if (eCreature==9529)
{ {
if( player->GetQuestRewardStatus(4102) ) if (pPlayer->GetQuestRewardStatus(4102))
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_BEACON, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(2849, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2849, _Creature->GetGUID());
}else if( player->GetTeam() == ALLIANCE ) }else if (pPlayer->GetTeam() == ALLIANCE)
player->SEND_GOSSIP_MENU(2843, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2843, _Creature->GetGUID());
else else
player->SEND_GOSSIP_MENU(2842, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2842, _Creature->GetGUID());
} }
return true; return true;
} }
bool GossipSelect_npcs_riverbreeze_and_silversky(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npcs_riverbreeze_and_silversky(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action==GOSSIP_ACTION_INFO_DEF+1) if (action==GOSSIP_ACTION_INFO_DEF+1)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
_Creature->CastSpell(player, 15120, false); _Creature->CastSpell(pPlayer, 15120, false);
} }
return true; return true;
} }
src/bindings/scripts/scripts/zone/feralas/feralas.cpp
+12 -12
View File
@@ -30,27 +30,27 @@ EndScriptData */
#define GOSSIP_HELLO "Buy somethin', will ya?" #define GOSSIP_HELLO "Buy somethin', will ya?"
bool GossipHello_npc_gregan_brewspewer(Player *player, Creature *_Creature) bool GossipHello_npc_gregan_brewspewer(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if( _Creature->isVendor() && player->GetQuestStatus(3909) == QUEST_STATUS_INCOMPLETE ) if (_Creature->isVendor() && pPlayer->GetQuestStatus(3909) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(2433,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2433,_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_gregan_brewspewer(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_gregan_brewspewer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+1) if (action == GOSSIP_ACTION_INFO_DEF+1)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
player->SEND_GOSSIP_MENU(2434,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2434,_Creature->GetGUID());
} }
if (action == GOSSIP_ACTION_TRADE) if (action == GOSSIP_ACTION_TRADE)
player->SEND_VENDORLIST( _Creature->GetGUID() ); pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
return true; return true;
} }
@@ -200,10 +200,10 @@ bool QuestAccept_npc_oox22fe(Player* pPlayer, Creature* pCreature, const Quest*
## npc_screecher_spirit ## npc_screecher_spirit
######*/ ######*/
bool GossipHello_npc_screecher_spirit(Player *player, Creature *_Creature) bool GossipHello_npc_screecher_spirit(Player* pPlayer, Creature *_Creature)
{ {
player->SEND_GOSSIP_MENU(2039, _Creature->GetGUID() ); pPlayer->SEND_GOSSIP_MENU(2039, _Creature->GetGUID());
player->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID()); pPlayer->TalkedToCreature(_Creature->GetEntry(), _Creature->GetGUID());
_Creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); _Creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
return true; return true;
src/bindings/scripts/scripts/zone/ghostlands/ghostlands.cpp
+45 -45
View File
@@ -37,26 +37,26 @@ EndContentData */
#define GOSSIP_H_BKD "Take Blood Knight Insignia" #define GOSSIP_H_BKD "Take Blood Knight Insignia"
bool GossipHello_npc_blood_knight_dawnstar(Player *player, Creature *_Creature) bool GossipHello_npc_blood_knight_dawnstar(Player* pPlayer, Creature *_Creature)
{ {
if (player->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(24226,1,true)) if (pPlayer->GetQuestStatus(9692) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(24226,1,true))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_H_BKD, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_blood_knight_dawnstar(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_blood_knight_dawnstar(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+1) if (action == GOSSIP_ACTION_INFO_DEF+1)
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, 24226, 1, false); uint8 msg = pPlayer->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 24226, 1, false);
if (msg == EQUIP_ERR_OK) if (msg == EQUIP_ERR_OK)
{ {
player->StoreNewItem( dest, 24226, 1, true); pPlayer->StoreNewItem(dest, 24226, 1, true);
player->PlayerTalkClass->ClearMenus(); pPlayer->PlayerTalkClass->ClearMenus();
} }
} }
return true; return true;
@@ -68,24 +68,24 @@ bool GossipSelect_npc_blood_knight_dawnstar(Player *player, Creature *_Creature,
#define GOSSIP_HBN "You gave the crew disguises?" #define GOSSIP_HBN "You gave the crew disguises?"
bool GossipHello_npc_budd_nedreck(Player *player, Creature *_Creature) bool GossipHello_npc_budd_nedreck(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if( player->GetQuestStatus(11166) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(11166) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HBN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_budd_nedreck(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_budd_nedreck(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF) if (action == GOSSIP_ACTION_INFO_DEF)
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
_Creature->CastSpell(player, 42540, false); _Creature->CastSpell(pPlayer, 42540, false);
} }
return true; return true;
} }
@@ -94,25 +94,25 @@ bool GossipSelect_npc_budd_nedreck(Player *player, Creature *_Creature, uint32 s
## npc_rathis_tomber ## npc_rathis_tomber
######*/ ######*/
bool GossipHello_npc_rathis_tomber(Player *player, Creature *_Creature) bool GossipHello_npc_rathis_tomber(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if( _Creature->isVendor() && player->GetQuestRewardStatus(9152) ) if (_Creature->isVendor() && pPlayer->GetQuestRewardStatus(9152))
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE);
player->SEND_GOSSIP_MENU(8432, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(8432, _Creature->GetGUID());
}else }else
player->SEND_GOSSIP_MENU(8431,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(8431,_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_rathis_tomber(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_rathis_tomber(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_TRADE) if (action == GOSSIP_ACTION_TRADE)
player->SEND_VENDORLIST( _Creature->GetGUID() ); pPlayer->SEND_VENDORLIST(_Creature->GetGUID());
return true; return true;
} }
@@ -120,13 +120,13 @@ bool GossipSelect_npc_rathis_tomber(Player *player, Creature *_Creature, uint32
## go_gilded_brazier (Paladin First Trail quest (9678)) ## go_gilded_brazier (Paladin First Trail quest (9678))
#####*/ #####*/
bool GOHello_gilded_brazier(Player *player, GameObject* _GO) bool GOHello_gilded_brazier(Player* pPlayer, GameObject* _GO)
{ {
if (player->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(9678) == QUEST_STATUS_INCOMPLETE)
{ {
Creature *Stillblade = player->SummonCreature(17716, 8106.11, -7542.06, 151.775, 3.02598, TEMPSUMMON_DEAD_DESPAWN, 60000); Creature *Stillblade = pPlayer->SummonCreature(17716, 8106.11, -7542.06, 151.775, 3.02598, TEMPSUMMON_DEAD_DESPAWN, 60000);
if (Stillblade) if (Stillblade)
(Stillblade->AI())->AttackStart(player); (Stillblade->AI())->AttackStart(pPlayer);
} }
return true; return true;
}; };
@@ -159,9 +159,9 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (!player) if (!pPlayer)
return; return;
switch(i) switch(i)
@@ -171,24 +171,24 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20)) if (GameObject* Cage = me->FindNearestGameObject(GO_CAGE, 20))
Cage->SetGoState(GO_STATE_ACTIVE); Cage->SetGoState(GO_STATE_ACTIVE);
DoScriptText(SAY_START, m_creature, player); DoScriptText(SAY_START, m_creature, pPlayer);
break; break;
} }
case 5: case 5:
DoScriptText(SAY_PROGRESS1, m_creature, player); DoScriptText(SAY_PROGRESS1, m_creature, pPlayer);
case 11: case 11:
DoScriptText(SAY_PROGRESS2, m_creature, player); DoScriptText(SAY_PROGRESS2, m_creature, pPlayer);
m_creature->SetOrientation(4.762841); m_creature->SetOrientation(4.762841);
break; break;
case 18: case 18:
{ {
DoScriptText(SAY_PROGRESS3, m_creature, player); DoScriptText(SAY_PROGRESS3, m_creature, pPlayer);
Creature* Summ1 = m_creature->SummonCreature(16342, 7627.083984, -7532.538086, 152.128616, 1.082733, TEMPSUMMON_DEAD_DESPAWN, 0); Creature* Summ1 = m_creature->SummonCreature(16342, 7627.083984, -7532.538086, 152.128616, 1.082733, TEMPSUMMON_DEAD_DESPAWN, 0);
Creature* Summ2 = m_creature->SummonCreature(16343, 7620.432129, -7532.550293, 152.454865, 0.827478, TEMPSUMMON_DEAD_DESPAWN, 0); Creature* Summ2 = m_creature->SummonCreature(16343, 7620.432129, -7532.550293, 152.454865, 0.827478, TEMPSUMMON_DEAD_DESPAWN, 0);
if (Summ1 && Summ2) if (Summ1 && Summ2)
{ {
Summ1->Attack(m_creature, true); Summ1->Attack(m_creature, true);
Summ2->Attack(player, true); Summ2->Attack(pPlayer, true);
} }
m_creature->AI()->AttackStart(Summ1); m_creature->AI()->AttackStart(Summ1);
break; break;
@@ -196,19 +196,19 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
case 19: m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break; case 19: m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
case 25: m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break; case 25: m_creature->AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE); break;
case 30: case 30:
if (player && player->GetTypeId() == TYPEID_PLAYER) if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
CAST_PLR(player)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS,m_creature); CAST_PLR(pPlayer)->GroupEventHappens(QUEST_ESCAPE_FROM_THE_CATACOMBS,m_creature);
break; break;
case 32: case 32:
m_creature->SetOrientation(2.978281); m_creature->SetOrientation(2.978281);
DoScriptText(SAY_END1, m_creature, player); DoScriptText(SAY_END1, m_creature, pPlayer);
break; break;
case 33: case 33:
m_creature->SetOrientation(5.858011); m_creature->SetOrientation(5.858011);
DoScriptText(SAY_END2, m_creature, player); DoScriptText(SAY_END2, m_creature, pPlayer);
Unit* CaptainHelios = me->FindNearestCreature(NPC_CAPTAIN_HELIOS, 50); Unit* CaptainHelios = me->FindNearestCreature(NPC_CAPTAIN_HELIOS, 50);
if (CaptainHelios) if (CaptainHelios)
DoScriptText(SAY_CAPTAIN_ANSWER, CaptainHelios, player); DoScriptText(SAY_CAPTAIN_ANSWER, CaptainHelios, pPlayer);
break; break;
} }
} }
@@ -229,9 +229,9 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
{ {
if (PlayerGUID) if (PlayerGUID)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (player) if (pPlayer)
CAST_PLR(player)->FailQuest(QUEST_ESCAPE_FROM_THE_CATACOMBS); CAST_PLR(pPlayer)->FailQuest(QUEST_ESCAPE_FROM_THE_CATACOMBS);
} }
} }
@@ -241,12 +241,12 @@ struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
} }
}; };
bool QuestAccept_npc_ranger_lilatha(Player* player, Creature* creature, Quest const* quest) bool QuestAccept_npc_ranger_lilatha(Player* pPlayer, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS) if (quest->GetQuestId() == QUEST_ESCAPE_FROM_THE_CATACOMBS)
{ {
creature->setFaction(113); creature->setFaction(113);
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
} }
return true; return true;
} }
src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp
+3 -3
View File
@@ -33,7 +33,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
{ {
instance_gruuls_lair(Map *map) : ScriptedInstance(map) {Initialize();}; instance_gruuls_lair(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint32 Encounters[ENCOUNTERS]; uint32 Encounters[ENCOUNTERS];
@@ -178,9 +178,9 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_gruuls_lair(Map* map) InstanceData* GetInstanceData_instance_gruuls_lair(Map* pMap)
{ {
return new instance_gruuls_lair(map); return new instance_gruuls_lair(pMap);
} }
void AddSC_instance_gruuls_lair() void AddSC_instance_gruuls_lair()
src/bindings/scripts/scripts/zone/gundrak/instance_gundrak.cpp
+3 -3
View File
@@ -3,12 +3,12 @@
struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance struct TRINITY_DLL_DECL instance_gundrak : public ScriptedInstance
{ {
instance_gundrak(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_gundrak(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
}; };
InstanceData* GetInstanceData_instance_gundrak(Map* map) InstanceData* GetInstanceData_instance_gundrak(Map* pMap)
{ {
return new instance_gundrak(map); return new instance_gundrak(pMap);
} }
void AddSC_instance_gundrak() void AddSC_instance_gundrak()
src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
+3 -3
View File
@@ -30,7 +30,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
{ {
instance_blood_furnace(Map *map) : ScriptedInstance(map) {Initialize();}; instance_blood_furnace(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint64 The_MakerGUID; uint64 The_MakerGUID;
uint64 BroggokGUID; uint64 BroggokGUID;
@@ -219,9 +219,9 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
}; };
InstanceData* GetInstanceData_instance_blood_furnace(Map* map) InstanceData* GetInstanceData_instance_blood_furnace(Map* pMap)
{ {
return new instance_blood_furnace(map); return new instance_blood_furnace(pMap);
} }
void AddSC_instance_blood_furnace() void AddSC_instance_blood_furnace()
src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
+6 -6
View File
@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI
uint32 Shadowbolt_Timer; uint32 Shadowbolt_Timer;
uint32 Summon_Timer; uint32 Summon_Timer;
uint32 SummonedCount; uint32 SummonedCount;
uint64 playerGUID; uint64 PlayerGUID;
bool CanPullBack; bool CanPullBack;
void Reset() void Reset()
@@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI
Shadowbolt_Timer = 2000; Shadowbolt_Timer = 2000;
Summon_Timer = 10000; Summon_Timer = 10000;
SummonedCount = 0; SummonedCount = 0;
playerGUID = 0; PlayerGUID = 0;
CanPullBack = false; CanPullBack = false;
} }
@@ -129,7 +129,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI
{ {
if (ShadowWhip_Timer < diff) if (ShadowWhip_Timer < diff)
{ {
if (Player* temp = Unit::GetPlayer(playerGUID)) if (Player* temp = Unit::GetPlayer(PlayerGUID))
{ {
//if unit dosen't have this flag, then no pulling back (script will attempt cast, even if orbital strike was resisted) //if unit dosen't have this flag, then no pulling back (script will attempt cast, even if orbital strike was resisted)
if (temp->HasUnitMovementFlag(MOVEMENTFLAG_FALLING)) if (temp->HasUnitMovementFlag(MOVEMENTFLAG_FALLING))
@@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI
DoCast(temp,SPELL_SHADOW_WHIP); DoCast(temp,SPELL_SHADOW_WHIP);
} }
} }
playerGUID = 0; PlayerGUID = 0;
ShadowWhip_Timer = 2000; ShadowWhip_Timer = 2000;
CanPullBack = false; CanPullBack = false;
}else ShadowWhip_Timer -= diff; }else ShadowWhip_Timer -= diff;
@@ -154,9 +154,9 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public ScriptedAI
{ {
DoCast(temp,SPELL_ORBITAL_STRIKE); DoCast(temp,SPELL_ORBITAL_STRIKE);
OrbitalStrike_Timer = 14000+rand()%2000; OrbitalStrike_Timer = 14000+rand()%2000;
playerGUID = temp->GetGUID(); PlayerGUID = temp->GetGUID();
if (playerGUID) if (PlayerGUID)
CanPullBack = true; CanPullBack = true;
} }
}else OrbitalStrike_Timer -= diff; }else OrbitalStrike_Timer -= diff;
src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
+6 -6
View File
@@ -501,7 +501,7 @@ struct TRINITY_DLL_DECL mob_hellfire_channelerAI : public ScriptedAI
}; };
//Manticron Cube //Manticron Cube
bool GOHello_go_Manticron_Cube(Player *player, GameObject* _GO) bool GOHello_go_Manticron_Cube(Player* pPlayer, GameObject* _GO)
{ {
ScriptedInstance* pInstance =_GO->GetInstanceData(); ScriptedInstance* pInstance =_GO->GetInstanceData();
if (!pInstance) return true; if (!pInstance) return true;
@@ -510,13 +510,13 @@ bool GOHello_go_Manticron_Cube(Player *player, GameObject* _GO)
if (!Magtheridon || !Magtheridon->isAlive()) return true; if (!Magtheridon || !Magtheridon->isAlive()) return true;
// if exhausted or already channeling return // if exhausted or already channeling return
if(player->HasAura(SPELL_MIND_EXHAUSTION) || player->HasAura(SPELL_SHADOW_GRASP)) if (pPlayer->HasAura(SPELL_MIND_EXHAUSTION) || pPlayer->HasAura(SPELL_SHADOW_GRASP))
return true; return true;
player->InterruptNonMeleeSpells(false); pPlayer->InterruptNonMeleeSpells(false);
player->CastSpell(player, SPELL_SHADOW_GRASP, true); pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP, true);
player->CastSpell(player, SPELL_SHADOW_GRASP_VISUAL, false); pPlayer->CastSpell(pPlayer, SPELL_SHADOW_GRASP_VISUAL, false);
CAST_AI(boss_magtheridonAI, Magtheridon->AI())->SetClicker(_GO->GetGUID(), player->GetGUID()); CAST_AI(boss_magtheridonAI, Magtheridon->AI())->SetClicker(_GO->GetGUID(), pPlayer->GetGUID());
return true; return true;
} }
src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
+3 -3
View File
@@ -35,7 +35,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
{ {
instance_magtheridons_lair(Map *Map) : ScriptedInstance(Map) instance_magtheridons_lair(Map* pMap) : ScriptedInstance(pMap)
{ {
Initialize(); Initialize();
} }
@@ -234,9 +234,9 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_magtheridons_lair(Map* map) InstanceData* GetInstanceData_instance_magtheridons_lair(Map* pMap)
{ {
return new instance_magtheridons_lair(map); return new instance_magtheridons_lair(pMap);
} }
void AddSC_instance_magtheridons_lair() void AddSC_instance_magtheridons_lair()
src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
+3 -3
View File
@@ -30,7 +30,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_shattered_halls : public ScriptedInstance struct TRINITY_DLL_DECL instance_shattered_halls : public ScriptedInstance
{ {
instance_shattered_halls(Map *map) : ScriptedInstance(map) {Initialize();}; instance_shattered_halls(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint32 Encounter[ENCOUNTERS]; uint32 Encounter[ENCOUNTERS];
uint64 nethekurseGUID; uint64 nethekurseGUID;
@@ -99,9 +99,9 @@ struct TRINITY_DLL_DECL instance_shattered_halls : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_shattered_halls(Map* map) InstanceData* GetInstanceData_instance_shattered_halls(Map* pMap)
{ {
return new instance_shattered_halls(map); return new instance_shattered_halls(pMap);
} }
void AddSC_instance_shattered_halls() void AddSC_instance_shattered_halls()
src/bindings/scripts/scripts/zone/hellfire_peninsula/hellfire_peninsula.cpp
+14 -14
View File
@@ -120,7 +120,7 @@ CreatureAI* GetAI_npc_aeranas(Creature *_Creature)
## go_haaleshi_altar ## go_haaleshi_altar
######*/ ######*/
bool GOHello_go_haaleshi_altar(Player *player, GameObject* _GO) bool GOHello_go_haaleshi_altar(Player* pPlayer, GameObject* _GO)
{ {
_GO->SummonCreature(C_AERANAS,-1321.79, 4043.80, 116.24, 1.25, TEMPSUMMON_TIMED_DESPAWN, 180000); _GO->SummonCreature(C_AERANAS,-1321.79, 4043.80, 116.24, 1.25, TEMPSUMMON_TIMED_DESPAWN, 180000);
return false; return false;
@@ -148,35 +148,35 @@ struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (!player || player->GetTypeId() != TYPEID_PLAYER) if (!pPlayer || pPlayer->GetTypeId() != TYPEID_PLAYER)
return; return;
switch (i) switch (i)
{ {
case 0: case 0:
DoScriptText(SAY_ELF_START, m_creature, player); DoScriptText(SAY_ELF_START, m_creature, pPlayer);
break; break;
case 9: case 9:
DoScriptText(SAY_ELF_SUMMON1, m_creature, player); DoScriptText(SAY_ELF_SUMMON1, m_creature, pPlayer);
// Spawn two Haal'eshi Talonguard // Spawn two Haal'eshi Talonguard
DoSpawnCreature(16967, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); DoSpawnCreature(16967, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
DoSpawnCreature(16967, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); DoSpawnCreature(16967, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
break; break;
case 13: case 13:
DoScriptText(SAY_ELF_RESTING, m_creature, player); DoScriptText(SAY_ELF_RESTING, m_creature, pPlayer);
break; break;
case 14: case 14:
DoScriptText(SAY_ELF_SUMMON2, m_creature, player); DoScriptText(SAY_ELF_SUMMON2, m_creature, pPlayer);
// Spawn two Haal'eshi Windwalker // Spawn two Haal'eshi Windwalker
DoSpawnCreature(16966, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); DoSpawnCreature(16966, -15, -15, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
DoSpawnCreature(16966, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); DoSpawnCreature(16966, -17, -17, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
break; break;
case 27: case 27:
DoScriptText(SAY_ELF_COMPLETE, m_creature, player); DoScriptText(SAY_ELF_COMPLETE, m_creature, pPlayer);
// Award quest credit // Award quest credit
player->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH,m_creature); pPlayer->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH,m_creature);
break; break;
} }
} }
@@ -206,9 +206,9 @@ struct TRINITY_DLL_DECL npc_wounded_blood_elfAI : public npc_escortAI
if (PlayerGUID) if (PlayerGUID)
{ {
// If NPC dies, player fails the quest // If NPC dies, player fails the quest
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (player) if (pPlayer)
player->FailQuest(QUEST_ROAD_TO_FALCON_WATCH); pPlayer->FailQuest(QUEST_ROAD_TO_FALCON_WATCH);
} }
} }
@@ -227,11 +227,11 @@ CreatureAI* GetAI_npc_wounded_blood_elf(Creature* pCreature)
return welfAI; return welfAI;
} }
bool QuestAccept_npc_wounded_blood_elf(Player* player, Creature* creature, Quest const* quest) bool QuestAccept_npc_wounded_blood_elf(Player* pPlayer, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH) if (quest->GetQuestId() == QUEST_ROAD_TO_FALCON_WATCH)
{ {
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
// Change faction so mobs attack // Change faction so mobs attack
creature->setFaction(775); creature->setFaction(775);
} }
src/bindings/scripts/scripts/zone/ironforge/ironforge.cpp
+17 -17
View File
@@ -37,45 +37,45 @@ EndContentData */
#define GOSSIP_ITEM_ROYAL_3 "Unbelievable! How dare they??" #define GOSSIP_ITEM_ROYAL_3 "Unbelievable! How dare they??"
#define GOSSIP_ITEM_ROYAL_4 "Of course I will help!" #define GOSSIP_ITEM_ROYAL_4 "Of course I will help!"
bool GossipHello_npc_royal_historian_archesonus(Player *player, Creature *_Creature) bool GossipHello_npc_royal_historian_archesonus(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (player->GetQuestStatus(3702) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(3702) == QUEST_STATUS_INCOMPLETE)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(2235, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2235, _Creature->GetGUID());
} }
else else
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_royal_historian_archesonus(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_royal_historian_archesonus(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(2236, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2236, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(2237, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2237, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(2238, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2238, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_ROYAL_4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->SEND_GOSSIP_MENU(2239, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(2239, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(3702); pPlayer->AreaExploredOrEventHappens(3702);
break; break;
} }
return true; return true;
src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp
+3 -3
View File
@@ -139,10 +139,10 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
DeSpawnAdds(); DeSpawnAdds();
//remove aura from spell Garrote when Moroes dies //remove aura from spell Garrote when Moroes dies
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
if (map->IsDungeon()) if (pMap->IsDungeon())
{ {
Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList const &PlayerList = pMap->GetPlayers();
if (PlayerList.isEmpty()) if (PlayerList.isEmpty())
return; return;
src/bindings/scripts/scripts/zone/karazhan/bosses_opera.cpp
+3 -3
View File
@@ -719,10 +719,10 @@ CreatureAI* GetAI_mob_cyclone(Creature* _Creature)
/**** The Wolf's Entry ****/ /**** The Wolf's Entry ****/
#define CREATURE_BIG_BAD_WOLF 17521 #define CREATURE_BIG_BAD_WOLF 17521
bool GossipHello_npc_grandmother(Player* player, Creature* _Creature) bool GossipHello_npc_grandmother(Player* pPlayer, Creature* _Creature)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_GRANDMA, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(8990, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(8990, _Creature->GetGUID());
return true; return true;
} }
src/bindings/scripts/scripts/zone/karazhan/instance_karazhan.cpp
+3 -3
View File
@@ -43,7 +43,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance
{ {
instance_karazhan(Map* map) : ScriptedInstance(map) {Initialize();} instance_karazhan(Map* pMap) : ScriptedInstance(pMap) {Initialize();}
uint32 m_auiEncounter[ENCOUNTERS]; uint32 m_auiEncounter[ENCOUNTERS];
std::string strSaveData; std::string strSaveData;
@@ -294,9 +294,9 @@ struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_karazhan(Map* map) InstanceData* GetInstanceData_instance_karazhan(Map* pMap)
{ {
return new instance_karazhan(map); return new instance_karazhan(pMap);
} }
void AddSC_instance_karazhan() void AddSC_instance_karazhan()
src/bindings/scripts/scripts/zone/karazhan/karazhan.cpp
+19 -19
View File
@@ -286,10 +286,10 @@ struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
{ {
if (WipeTimer < diff) if (WipeTimer < diff)
{ {
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
if(!map->IsDungeon()) return; if (!pMap->IsDungeon()) return;
Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList const &PlayerList = pMap->GetPlayers();
if (PlayerList.isEmpty()) if (PlayerList.isEmpty())
return; return;
@@ -359,34 +359,34 @@ bool GossipHello_npc_barnes(Player* pPlayer, Creature* pCreature)
return true; return true;
} }
bool GossipSelect_npc_barnes(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_barnes(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
npc_barnesAI* pBarnesAI = CAST_AI(npc_barnesAI,_Creature->AI()); npc_barnesAI* pBarnesAI = CAST_AI(npc_barnesAI,_Creature->AI());
switch(action) switch(action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, OZ_GOSSIP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(8971, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(8971, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
pBarnesAI->StartEvent(); pBarnesAI->StartEvent();
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_OZ; pBarnesAI->m_uiEventId = EVENT_OZ;
outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_OZ",player->GetGUID()); outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_OZ",pPlayer->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_HOOD; pBarnesAI->m_uiEventId = EVENT_HOOD;
outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_HOOD",player->GetGUID()); outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_HOOD",pPlayer->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
pBarnesAI->m_uiEventId = EVENT_RAJ; pBarnesAI->m_uiEventId = EVENT_RAJ;
outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_RAJ",player->GetGUID()); outstring_log("TSCR: player (GUID %i) manually set Opera event to EVENT_RAJ",pPlayer->GetGUID());
break; break;
} }
@@ -417,12 +417,12 @@ bool GossipHello_npc_berthold(Player* pPlayer, Creature* pCreature)
return true; return true;
} }
bool GossipSelect_npc_berthold(Player* player, Creature* _Creature, uint32 sender, uint32 action) bool GossipSelect_npc_berthold(Player* pPlayer, Creature* _Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF + 1) if (action == GOSSIP_ACTION_INFO_DEF + 1)
player->CastSpell(player, SPELL_TELEPORT, true); pPlayer->CastSpell(pPlayer, SPELL_TELEPORT, true);
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
return true; return true;
} }
@@ -515,7 +515,7 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
uint32 NextStep(uint32 Step) uint32 NextStep(uint32 Step)
{ {
Unit* arca = Unit::GetUnit((*m_creature),ArcanagosGUID); Unit* arca = Unit::GetUnit((*m_creature),ArcanagosGUID);
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
switch(Step) switch(Step)
{ {
case 0: return 9999999; case 0: return 9999999;
@@ -571,9 +571,9 @@ struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
m_creature->SetVisibility(VISIBILITY_OFF); m_creature->SetVisibility(VISIBILITY_OFF);
m_creature->ClearInCombat(); m_creature->ClearInCombat();
if(map->IsDungeon()) if (pMap->IsDungeon())
{ {
InstanceMap::PlayerList const &PlayerList = map->GetPlayers(); InstanceMap::PlayerList const &PlayerList = pMap->GetPlayers();
for (InstanceMap::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) for (InstanceMap::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{ {
if (i->getSource()->isAlive()) if (i->getSource()->isAlive())
src/bindings/scripts/scripts/zone/loch_modan/loch_modan.cpp
+19 -19
View File
@@ -40,49 +40,49 @@ EndContentData */
#define GOSSIP_MP5 "Ok, i'll try to remember that." #define GOSSIP_MP5 "Ok, i'll try to remember that."
#define GOSSIP_MP6 "A key? Ok!" #define GOSSIP_MP6 "A key? Ok!"
bool GossipHello_npc_mountaineer_pebblebitty(Player *player, Creature *_Creature) bool GossipHello_npc_mountaineer_pebblebitty(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (!player->GetQuestRewardStatus(3181) == 1) if (!pPlayer->GetQuestRewardStatus(3181) == 1)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_mountaineer_pebblebitty(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_mountaineer_pebblebitty(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(1833, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1833, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(1834, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1834, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->SEND_GOSSIP_MENU(1835, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1835, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
player->SEND_GOSSIP_MENU(1836, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1836, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
player->SEND_GOSSIP_MENU(1837, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1837, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_MP6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
player->SEND_GOSSIP_MENU(1838, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(1838, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+7: case GOSSIP_ACTION_INFO_DEF+7:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
break; break;
} }
return true; return true;
src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp
+3 -3
View File
@@ -35,7 +35,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance
{ {
instance_magisters_terrace(Map* map) : ScriptedInstance(map) {Initialize();} instance_magisters_terrace(Map* pMap) : ScriptedInstance(pMap) {Initialize();}
uint32 Encounters[NUMBER_OF_ENCOUNTERS]; uint32 Encounters[NUMBER_OF_ENCOUNTERS];
uint32 DelrissaDeathCount; uint32 DelrissaDeathCount;
@@ -189,9 +189,9 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_magisters_terrace(Map* map) InstanceData* GetInstanceData_instance_magisters_terrace(Map* pMap)
{ {
return new instance_magisters_terrace(map); return new instance_magisters_terrace(pMap);
} }
void AddSC_instance_magisters_terrace() void AddSC_instance_magisters_terrace()
src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp
+3 -3
View File
@@ -40,7 +40,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance
{ {
instance_molten_core(Map *map) : ScriptedInstance(map) {Initialize();}; instance_molten_core(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint64 Lucifron, Magmadar, Gehennas, Garr, Geddon, Shazzrah, Sulfuron, Golemagg, Domo, Ragnaros, FlamewakerPriest; uint64 Lucifron, Magmadar, Gehennas, Garr, Geddon, Shazzrah, Sulfuron, Golemagg, Domo, Ragnaros, FlamewakerPriest;
uint64 RuneKoro, RuneZeth, RuneMazj, RuneTheri, RuneBlaz, RuneKress, RuneMohn, m_uiFirelordCacheGUID;; uint64 RuneKoro, RuneZeth, RuneMazj, RuneTheri, RuneBlaz, RuneKress, RuneMohn, m_uiFirelordCacheGUID;;
@@ -253,9 +253,9 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance
} }
}; };
InstanceData* GetInstance_instance_molten_core(Map *map) InstanceData* GetInstance_instance_molten_core(Map* pMap)
{ {
return new instance_molten_core (map); return new instance_molten_core (pMap);
} }
void AddSC_instance_molten_core() void AddSC_instance_molten_core()
src/bindings/scripts/scripts/zone/moonglade/moonglade.cpp
+76 -76
View File
@@ -47,43 +47,43 @@ enum
#define GOSSIP_ITEM_THUNDER "I'd like to fly to Thunder Bluff." #define GOSSIP_ITEM_THUNDER "I'd like to fly to Thunder Bluff."
#define GOSSIP_ITEM_AQ_END "Do you know where I can find Half Pendant of Aquatic Endurance?" #define GOSSIP_ITEM_AQ_END "Do you know where I can find Half Pendant of Aquatic Endurance?"
bool GossipHello_npc_bunthen_plainswind(Player *player, Creature *_Creature) bool GossipHello_npc_bunthen_plainswind(Player* pPlayer, Creature *_Creature)
{ {
if(player->getClass() != CLASS_DRUID) if (pPlayer->getClass() != CLASS_DRUID)
player->SEND_GOSSIP_MENU(4916,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4916,_Creature->GetGUID());
else if(player->GetTeam() != HORDE) else if (pPlayer->GetTeam() != HORDE)
{ {
if(player->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(4917,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4917,_Creature->GetGUID());
} }
else if(player->getClass() == CLASS_DRUID && player->GetTeam() == HORDE) else if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == HORDE)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THUNDER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_THUNDER, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
if(player->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_END, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(4918,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4918,_Creature->GetGUID());
} }
return true; return true;
} }
bool GossipSelect_npc_bunthen_plainswind(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_bunthen_plainswind(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch(action) switch(action)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
if (player->getClass() == CLASS_DRUID && player->GetTeam() == HORDE) if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == HORDE)
player->ActivateTaxiPathTo(TAXI_PATH_ID_HORDE); pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_HORDE);
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
player->SEND_GOSSIP_MENU(5373,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5373,_Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
player->SEND_GOSSIP_MENU(5376,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5376,_Creature->GetGUID());
break; break;
} }
return true; return true;
@@ -98,42 +98,42 @@ bool GossipSelect_npc_bunthen_plainswind(Player *player, Creature *_Creature, ui
#define GOSSIP_BEAR3 "I seek to understand the importance of strength of the heart." #define GOSSIP_BEAR3 "I seek to understand the importance of strength of the heart."
#define GOSSIP_BEAR4 "I have heard your words, Great Bear Spirit, and I understand. I now seek your blessings to fully learn the way of the Claw." #define GOSSIP_BEAR4 "I have heard your words, Great Bear Spirit, and I understand. I now seek your blessings to fully learn the way of the Claw."
bool GossipHello_npc_great_bear_spirit(Player *player, Creature *_Creature) bool GossipHello_npc_great_bear_spirit(Player* pPlayer, Creature *_Creature)
{ {
//ally or horde quest //ally or horde quest
if (player->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(5929) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(5930) == QUEST_STATUS_INCOMPLETE)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(4719, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4719, _Creature->GetGUID());
} }
else else
player->SEND_GOSSIP_MENU(4718, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4718, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_great_bear_spirit(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_great_bear_spirit(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(4721, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4721, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(4733, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4733, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BEAR4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(4734, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4734, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
player->SEND_GOSSIP_MENU(4735, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4735, _Creature->GetGUID());
if (player->GetQuestStatus(5929)==QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(5929)==QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(5929); pPlayer->AreaExploredOrEventHappens(5929);
if (player->GetQuestStatus(5930)==QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(5930)==QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(5930); pPlayer->AreaExploredOrEventHappens(5930);
break; break;
} }
return true; return true;
@@ -146,43 +146,43 @@ bool GossipSelect_npc_great_bear_spirit(Player *player, Creature *_Creature, uin
#define GOSSIP_ITEM_RUTHERAN "I'd like to fly to Rut'theran Village." #define GOSSIP_ITEM_RUTHERAN "I'd like to fly to Rut'theran Village."
#define GOSSIP_ITEM_AQ_AGI "Do you know where I can find Half Pendant of Aquatic Agility?" #define GOSSIP_ITEM_AQ_AGI "Do you know where I can find Half Pendant of Aquatic Agility?"
bool GossipHello_npc_silva_filnaveth(Player *player, Creature *_Creature) bool GossipHello_npc_silva_filnaveth(Player* pPlayer, Creature *_Creature)
{ {
if(player->getClass() != CLASS_DRUID) if (pPlayer->getClass() != CLASS_DRUID)
player->SEND_GOSSIP_MENU(4913,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4913,_Creature->GetGUID());
else if(player->GetTeam() != ALLIANCE) else if (pPlayer->GetTeam() != ALLIANCE)
{ {
if(player->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(QUEST_SEA_LION_HORDE) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(4915,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4915,_Creature->GetGUID());
} }
else if(player->getClass() == CLASS_DRUID && player->GetTeam() == ALLIANCE) else if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == ALLIANCE)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RUTHERAN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_RUTHERAN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
if(player->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(QUEST_SEA_LION_ALLY) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_AQ_AGI, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(4914,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4914,_Creature->GetGUID());
} }
return true; return true;
} }
bool GossipSelect_npc_silva_filnaveth(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_silva_filnaveth(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch(action) switch(action)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
if (player->getClass() == CLASS_DRUID && player->GetTeam() == ALLIANCE) if (pPlayer->getClass() == CLASS_DRUID && pPlayer->GetTeam() == ALLIANCE)
player->ActivateTaxiPathTo(TAXI_PATH_ID_ALLY); pPlayer->ActivateTaxiPathTo(TAXI_PATH_ID_ALLY);
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
player->SEND_GOSSIP_MENU(5374,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5374,_Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
player->SEND_GOSSIP_MENU(5375,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5375,_Creature->GetGUID());
break; break;
} }
return true; return true;
@@ -288,10 +288,10 @@ public:
if (!PlayerGUID) if (!PlayerGUID)
return; return;
Player *player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(player && player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE) if (pPlayer && pPlayer->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
{ {
player->FailQuest(10965); pPlayer->FailQuest(10965);
PlayerGUID = 0; PlayerGUID = 0;
Reset(); Reset();
} }
@@ -299,10 +299,10 @@ public:
void EnterEvadeMode() void EnterEvadeMode()
{ {
Player *player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(player && player->isInCombat() && player->getAttackerForHelper()) if (pPlayer && pPlayer->isInCombat() && pPlayer->getAttackerForHelper())
{ {
AttackStart(player->getAttackerForHelper()); AttackStart(pPlayer->getAttackerForHelper());
return; return;
} }
npc_escortAI::EnterEvadeMode(); npc_escortAI::EnterEvadeMode();
@@ -318,17 +318,17 @@ public:
} }
} }
void StartEvent(Player *player) void StartEvent(Player* pPlayer)
{ {
if(!player) if (!pPlayer)
return; return;
if(player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
{ {
for(uint8 i = 0; i < 41; ++i) for(uint8 i = 0; i < 41; ++i)
{ {
AddWaypoint(i, Clintar_spirit_WP[i][0], Clintar_spirit_WP[i][1], Clintar_spirit_WP[i][2], (uint32)Clintar_spirit_WP[i][4]); AddWaypoint(i, Clintar_spirit_WP[i][0], Clintar_spirit_WP[i][1], Clintar_spirit_WP[i][2], (uint32)Clintar_spirit_WP[i][4]);
} }
PlayerGUID = player->GetGUID(); PlayerGUID = pPlayer->GetGUID();
Start(true,false,PlayerGUID); Start(true,false,PlayerGUID);
} }
return; return;
@@ -348,9 +348,9 @@ public:
{ {
if (checkPlayer_Timer < diff) if (checkPlayer_Timer < diff)
{ {
Player *player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(player && player->isInCombat() && player->getAttackerForHelper()) if (pPlayer && pPlayer->isInCombat() && pPlayer->getAttackerForHelper())
AttackStart(player->getAttackerForHelper()); AttackStart(pPlayer->getAttackerForHelper());
checkPlayer_Timer = 1000; checkPlayer_Timer = 1000;
}else checkPlayer_Timer -= diff; }else checkPlayer_Timer -= diff;
} }
@@ -358,8 +358,8 @@ public:
if (Event_onWait && Event_Timer < diff) if (Event_onWait && Event_Timer < diff)
{ {
Player *player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(!player || (player && player->GetQuestStatus(10965) == QUEST_STATUS_NONE)) if (!pPlayer || (pPlayer && pPlayer->GetQuestStatus(10965) == QUEST_STATUS_NONE))
{ {
m_creature->setDeathState(JUST_DIED); m_creature->setDeathState(JUST_DIED);
return; return;
@@ -390,7 +390,7 @@ public:
break; break;
case 1: case 1:
m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
DoScriptText(CLINTAR_SPIRIT_SAY_GET_ONE, m_creature, player); DoScriptText(CLINTAR_SPIRIT_SAY_GET_ONE, m_creature, pPlayer);
Event_onWait = false; Event_onWait = false;
break; break;
} }
@@ -413,7 +413,7 @@ public:
switch(Step) switch(Step)
{ {
case 0: case 0:
DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, m_creature, player); DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, m_creature, pPlayer);
Event_Timer = 15000; Event_Timer = 15000;
Step = 1; Step = 1;
break; break;
@@ -460,7 +460,7 @@ public:
switch(Step) switch(Step)
{ {
case 0: case 0:
DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, m_creature, player); DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, m_creature, pPlayer);
Event_Timer = 4000; Event_Timer = 4000;
Step = 1; Step = 1;
break; break;
@@ -474,8 +474,8 @@ public:
{ {
case 0: case 0:
m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2); m_creature->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2);
DoScriptText(CLINTAR_SPIRIT_SAY_GET_FINAL, m_creature, player); DoScriptText(CLINTAR_SPIRIT_SAY_GET_FINAL, m_creature, pPlayer);
player->CompleteQuest(10965); pPlayer->CompleteQuest(10965);
Event_Timer = 1500; Event_Timer = 1500;
Step = 1; Step = 1;
break; break;
@@ -485,7 +485,7 @@ public:
Step = 2; Step = 2;
break; break;
case 2: case 2:
player->TalkedToCreature(m_creature->GetEntry(), m_creature->GetGUID()); pPlayer->TalkedToCreature(m_creature->GetEntry(), m_creature->GetGUID());
PlayerGUID = 0; PlayerGUID = 0;
Reset(); Reset();
m_creature->setDeathState(JUST_DIED); m_creature->setDeathState(JUST_DIED);
@@ -520,13 +520,13 @@ CreatureAI* GetAI_npc_clintar_spirit(Creature *_Creature)
#define CLINTAR_SPIRIT 22916 #define CLINTAR_SPIRIT 22916
bool QuestAccept_npc_clintar_dreamwalker(Player *player, Creature *creature, Quest const *quest ) bool QuestAccept_npc_clintar_dreamwalker(Player* pPlayer, Creature *creature, Quest const *quest)
{ {
if (quest->GetQuestId() == 10965) 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 = 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);
if (clintar_spirit) if (clintar_spirit)
CAST_AI(npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(player); CAST_AI(npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(pPlayer);
} }
return true; return true;
} }
src/bindings/scripts/scripts/zone/mulgore/mulgore.cpp
+7 -7
View File
@@ -36,23 +36,23 @@ EndContentData */
#define GOSSIP_SW "Tell me a story, Skorn." #define GOSSIP_SW "Tell me a story, Skorn."
bool GossipHello_npc_skorn_whitecloud(Player *player, Creature *_Creature) bool GossipHello_npc_skorn_whitecloud(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (!player->GetQuestRewardStatus(770)) if (!pPlayer->GetQuestRewardStatus(770))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF ); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(522,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(522,_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_skorn_whitecloud(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_skorn_whitecloud(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF) if (action == GOSSIP_ACTION_INFO_DEF)
player->SEND_GOSSIP_MENU(523,_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(523,_Creature->GetGUID());
return true; return true;
} }
src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp
+108 -108
View File
@@ -193,35 +193,35 @@ CreatureAI* GetAI_mob_lump(Creature *_creature)
return new mob_lumpAI(_creature); return new mob_lumpAI(_creature);
} }
bool GossipHello_mob_lump(Player *player, Creature *_Creature) bool GossipHello_mob_lump(Player* pPlayer, Creature *_Creature)
{ {
if (player->GetQuestStatus(9918) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(9918) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(9352, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9352, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_mob_lump(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_mob_lump(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(9353, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9353, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(9354, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9354, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(9355, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9355, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->SEND_GOSSIP_MENU(9356, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9356, _Creature->GetGUID());
player->TalkedToCreature(18354, _Creature->GetGUID()); pPlayer->TalkedToCreature(18354, _Creature->GetGUID());
break; break;
} }
return true; return true;
@@ -272,79 +272,79 @@ CreatureAI* GetAI_mob_sunspring_villager(Creature *_Creature)
#define GOSSIP_SATS5 "Ok." #define GOSSIP_SATS5 "Ok."
#define GOSSIP_SATS6 "[PH] Story done" #define GOSSIP_SATS6 "[PH] Story done"
bool GossipHello_npc_altruis_the_sufferer(Player *player, Creature *_Creature) bool GossipHello_npc_altruis_the_sufferer(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
//gossip before obtaining Survey the Land //gossip before obtaining Survey the Land
if ( player->GetQuestStatus(9991) == QUEST_STATUS_NONE ) if (pPlayer->GetQuestStatus(9991) == QUEST_STATUS_NONE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10);
//gossip when Survey the Land is incomplete (technically, after the flight) //gossip when Survey the Land is incomplete (technically, after the flight)
if (player->GetQuestStatus(9991) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(9991) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20);
//wowwiki.com/Varedis //wowwiki.com/Varedis
if (player->GetQuestStatus(10646) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10646) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+30); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+30);
player->SEND_GOSSIP_MENU(9419, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9419, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_altruis_the_sufferer(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_altruis_the_sufferer(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+10: case GOSSIP_ACTION_INFO_DEF+10:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
player->SEND_GOSSIP_MENU(9420, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9420, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+11: case GOSSIP_ACTION_INFO_DEF+11:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
player->SEND_GOSSIP_MENU(9421, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9421, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+12: case GOSSIP_ACTION_INFO_DEF+12:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
player->SEND_GOSSIP_MENU(9422, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9422, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+13: case GOSSIP_ACTION_INFO_DEF+13:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
player->SEND_GOSSIP_MENU(9423, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9423, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+14: case GOSSIP_ACTION_INFO_DEF+14:
player->SEND_GOSSIP_MENU(9424, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9424, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+20: case GOSSIP_ACTION_INFO_DEF+20:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
player->SEND_GOSSIP_MENU(9427, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9427, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+21: case GOSSIP_ACTION_INFO_DEF+21:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(9991); pPlayer->AreaExploredOrEventHappens(9991);
break; break;
case GOSSIP_ACTION_INFO_DEF+30: case GOSSIP_ACTION_INFO_DEF+30:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 31); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SATS6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 31);
player->SEND_GOSSIP_MENU(384, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(384, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+31: case GOSSIP_ACTION_INFO_DEF+31:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(10646); pPlayer->AreaExploredOrEventHappens(10646);
break; break;
} }
return true; return true;
} }
bool QuestAccept_npc_altruis_the_sufferer(Player *player, Creature *creature, Quest const *quest ) bool QuestAccept_npc_altruis_the_sufferer(Player* pPlayer, Creature *creature, Quest const *quest)
{ {
if ( !player->GetQuestRewardStatus(9991) ) //Survey the Land, q-id 9991 if (!pPlayer->GetQuestRewardStatus(9991)) //Survey the Land, q-id 9991
{ {
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(532); //TaxiPath 532 pPlayer->ActivateTaxiPathTo(532); //TaxiPath 532
} }
return true; return true;
} }
@@ -369,84 +369,84 @@ bool QuestAccept_npc_altruis_the_sufferer(Player *player, Creature *creature, Qu
#define GOSSIP_SGG11 "I will return to Azeroth at once, Greatmother." #define GOSSIP_SGG11 "I will return to Azeroth at once, Greatmother."
//all the textId's for the below is unknown, but i do believe the gossip item texts are proper. //all the textId's for the below is unknown, but i do believe the gossip item texts are proper.
bool GossipHello_npc_greatmother_geyah(Player *player, Creature *_Creature) bool GossipHello_npc_greatmother_geyah(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (player->GetQuestStatus(10044) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10044) == QUEST_STATUS_INCOMPLETE)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
} }
else if (player->GetQuestStatus(10172) == QUEST_STATUS_INCOMPLETE) else if (pPlayer->GetQuestStatus(10172) == QUEST_STATUS_INCOMPLETE)
{ {
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
} }
else else
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_greatmother_geyah(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_greatmother_geyah(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF + 1: case GOSSIP_ACTION_INFO_DEF + 1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 2: case GOSSIP_ACTION_INFO_DEF + 2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 3: case GOSSIP_ACTION_INFO_DEF + 3:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 4: case GOSSIP_ACTION_INFO_DEF + 4:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 5: case GOSSIP_ACTION_INFO_DEF + 5:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 6: case GOSSIP_ACTION_INFO_DEF + 6:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 7: case GOSSIP_ACTION_INFO_DEF + 7:
player->AreaExploredOrEventHappens(10044); pPlayer->AreaExploredOrEventHappens(10044);
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
break; break;
case GOSSIP_ACTION_INFO_DEF + 10: case GOSSIP_ACTION_INFO_DEF + 10:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 11: case GOSSIP_ACTION_INFO_DEF + 11:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 12: case GOSSIP_ACTION_INFO_DEF + 12:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 13: case GOSSIP_ACTION_INFO_DEF + 13:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 14: case GOSSIP_ACTION_INFO_DEF + 14:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SGG11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF + 15: case GOSSIP_ACTION_INFO_DEF + 15:
player->AreaExploredOrEventHappens(10172); pPlayer->AreaExploredOrEventHappens(10172);
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
break; break;
} }
return true; return true;
@@ -465,57 +465,57 @@ bool GossipSelect_npc_greatmother_geyah(Player *player, Creature *_Creature, uin
#define GOSSIP_SLB6 "We will fight you until the end, then, Lantresor. We will not stand idly by as you pillage our towns and kill our people." #define GOSSIP_SLB6 "We will fight you until the end, then, Lantresor. We will not stand idly by as you pillage our towns and kill our people."
#define GOSSIP_SLB7 "What do I need to do?" #define GOSSIP_SLB7 "What do I need to do?"
bool GossipHello_npc_lantresor_of_the_blade(Player *player, Creature *_Creature) bool GossipHello_npc_lantresor_of_the_blade(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (player->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HLB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HLB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
player->SEND_GOSSIP_MENU(9361, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9361, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_lantresor_of_the_blade(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_lantresor_of_the_blade(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF: case GOSSIP_ACTION_INFO_DEF:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
player->SEND_GOSSIP_MENU(9362, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9362, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
player->SEND_GOSSIP_MENU(9363, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9363, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
player->SEND_GOSSIP_MENU(9364, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9364, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
player->SEND_GOSSIP_MENU(9365, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9365, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
player->SEND_GOSSIP_MENU(9366, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9366, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
player->SEND_GOSSIP_MENU(9367, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9367, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SLB7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
player->SEND_GOSSIP_MENU(9368, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9368, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+7: case GOSSIP_ACTION_INFO_DEF+7:
player->SEND_GOSSIP_MENU(9369, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(9369, _Creature->GetGUID());
if (player->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(10107); pPlayer->AreaExploredOrEventHappens(10107);
if (player->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE)
player->AreaExploredOrEventHappens(10108); pPlayer->AreaExploredOrEventHappens(10108);
break; break;
} }
return true; return true;
@@ -615,13 +615,13 @@ struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI
if (fleeing && m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != FLEEING_MOTION_TYPE) if (fleeing && m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() != FLEEING_MOTION_TYPE)
fleeing = false; fleeing = false;
Player *player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if(player && m_creature->IsWithinDistInMap(player, 30)) if (pPlayer && m_creature->IsWithinDistInMap(pPlayer, 30))
{ {
if (!fleeing) if (!fleeing)
{ {
m_creature->DeleteThreatList(); m_creature->DeleteThreatList();
m_creature->GetMotionMaster()->MoveFleeing(player); m_creature->GetMotionMaster()->MoveFleeing(pPlayer);
fleeing = true; fleeing = true;
} }
} }
src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp
+3 -3
View File
@@ -292,10 +292,10 @@ struct TRINITY_DLL_DECL mob_gothik_minionAI : public SpellAI
if (!_EnterEvadeMode()) if (!_EnterEvadeMode())
return; return;
Map *map = me->GetMap(); Map* pMap = me->GetMap();
if(map->IsDungeon()) if (pMap->IsDungeon())
{ {
Map::PlayerList const &PlayerList = map->GetPlayers(); Map::PlayerList const &PlayerList = pMap->GetPlayers();
for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
{ {
if (i->getSource()->isAlive() && SIDE_CHECK(i->getSource())) if (i->getSource()->isAlive() && SIDE_CHECK(i->getSource()))
src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
+2 -2
View File
@@ -158,8 +158,8 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
{ {
for(IceBlockMap::iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr) for(IceBlockMap::iterator itr = iceblocks.begin(); itr != iceblocks.end(); ++itr)
{ {
if(Player *player = Unit::GetPlayer(itr->first)) if (Player* pPlayer = Unit::GetPlayer(itr->first))
player->RemoveAura(SPELL_ICEBOLT); pPlayer->RemoveAura(SPELL_ICEBOLT);
if (GameObject *go = GameObject::GetGameObject(*me, itr->second)) if (GameObject *go = GameObject::GetGameObject(*me, itr->second))
go->DeleteObjectWithOwner(); go->DeleteObjectWithOwner();
} }
src/bindings/scripts/scripts/zone/naxxramas/instance_naxxramas.cpp
+6 -6
View File
@@ -97,7 +97,7 @@ inline uint32 GetEruptionSection(float x, float y)
struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData
{ {
instance_naxxramas(Map *map) : InstanceData(map) instance_naxxramas(Map* pMap) : InstanceData(pMap)
, Sapphiron(NULL), GothikGate(NULL), HorsemenChest(NULL), HorsemenNum(0) , Sapphiron(NULL), GothikGate(NULL), HorsemenChest(NULL), HorsemenNum(0)
{ {
SetBossNumber(MAX_BOSS_NUMBER); SetBossNumber(MAX_BOSS_NUMBER);
@@ -183,12 +183,12 @@ struct TRINITY_DLL_DECL instance_naxxramas : public InstanceData
} }
}; };
bool AreaTrigger_at_naxxramas_frostwyrm_wing(Player *player, AreaTriggerEntry *at) bool AreaTrigger_at_naxxramas_frostwyrm_wing(Player* pPlayer, AreaTriggerEntry *at)
{ {
if(player->isGameMaster()) if (pPlayer->isGameMaster())
return false; return false;
InstanceData *data = player->GetInstanceData(); InstanceData *data = pPlayer->GetInstanceData();
if (data) if (data)
for(uint32 i = BOSS_ANUBREKHAN; i < BOSS_SAPPHIRON; ++i) for(uint32 i = BOSS_ANUBREKHAN; i < BOSS_SAPPHIRON; ++i)
if (data->GetBossState(i) != DONE) if (data->GetBossState(i) != DONE)
@@ -197,9 +197,9 @@ bool AreaTrigger_at_naxxramas_frostwyrm_wing(Player *player, AreaTriggerEntry *a
return false; return false;
} }
InstanceData* GetInstanceData_instance_naxxramas(Map* map) InstanceData* GetInstanceData_instance_naxxramas(Map* pMap)
{ {
return new instance_naxxramas(map); return new instance_naxxramas(pMap);
} }
void AddSC_instance_naxxramas() void AddSC_instance_naxxramas()
src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp
+57 -57
View File
@@ -287,12 +287,12 @@ CreatureAI* GetAI_npc_manaforge_control_console(Creature *_Creature)
######*/ ######*/
//TODO: clean up this workaround when Trinity adds support to do it properly (with gossip selections instead of instant summon) //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 *player, GameObject* _GO) bool GOHello_go_manaforge_control_console(Player* pPlayer, GameObject* _GO)
{ {
if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER) if (_GO->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER)
{ {
player->PrepareQuestMenu(_GO->GetGUID()); pPlayer->PrepareQuestMenu(_GO->GetGUID());
player->SendPreparedQuest(_GO->GetGUID()); pPlayer->SendPreparedQuest(_GO->GetGUID());
} }
Creature* manaforge; Creature* manaforge;
@@ -301,30 +301,30 @@ bool GOHello_go_manaforge_control_console(Player *player, GameObject* _GO)
switch(_GO->GetAreaId()) switch(_GO->GetAreaId())
{ {
case 3726: //b'naar case 3726: //b'naar
if( (player->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) && if ((pPlayer->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) &&
player->HasItemCount(29366,1)) pPlayer->HasItemCount(29366,1))
manaforge = player->SummonCreature(ENTRY_BNAAR_C_CONSOLE,2918.95,4189.98,161.88,0.34,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE,2918.95,4189.98,161.88,0.34,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
break; break;
case 3730: //coruu case 3730: //coruu
if( (player->GetQuestStatus(10321) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10330) == QUEST_STATUS_INCOMPLETE) && if ((pPlayer->GetQuestStatus(10321) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10330) == QUEST_STATUS_INCOMPLETE) &&
player->HasItemCount(29396,1)) pPlayer->HasItemCount(29396,1))
manaforge = player->SummonCreature(ENTRY_CORUU_C_CONSOLE,2426.77,2750.38,133.24,2.14,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE,2426.77,2750.38,133.24,2.14,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
break; break;
case 3734: //duro case 3734: //duro
if( (player->GetQuestStatus(10322) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10338) == QUEST_STATUS_INCOMPLETE) && if ((pPlayer->GetQuestStatus(10322) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10338) == QUEST_STATUS_INCOMPLETE) &&
player->HasItemCount(29397,1)) pPlayer->HasItemCount(29397,1))
manaforge = player->SummonCreature(ENTRY_DURO_C_CONSOLE,2976.48,2183.29,163.20,1.85,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE,2976.48,2183.29,163.20,1.85,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
break; break;
case 3722: //ara case 3722: //ara
if( (player->GetQuestStatus(10323) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10365) == QUEST_STATUS_INCOMPLETE) && if ((pPlayer->GetQuestStatus(10323) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10365) == QUEST_STATUS_INCOMPLETE) &&
player->HasItemCount(29411,1)) pPlayer->HasItemCount(29411,1))
manaforge = player->SummonCreature(ENTRY_ARA_C_CONSOLE,4013.71,4028.76,192.10,1.25,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000); manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE,4013.71,4028.76,192.10,1.25,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
break; break;
} }
if (manaforge) if (manaforge)
{ {
CAST_AI(npc_manaforge_control_consoleAI, manaforge->AI())->someplayer = player->GetGUID(); CAST_AI(npc_manaforge_control_consoleAI, manaforge->AI())->someplayer = pPlayer->GetGUID();
CAST_AI(npc_manaforge_control_consoleAI, manaforge->AI())->goConsole = _GO->GetGUID(); CAST_AI(npc_manaforge_control_consoleAI, manaforge->AI())->goConsole = _GO->GetGUID();
_GO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE); _GO->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
} }
@@ -364,7 +364,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
npc_commander_dawnforgeAI(Creature *c) : ScriptedAI(c) { Reset (); } npc_commander_dawnforgeAI(Creature *c) : ScriptedAI(c) { Reset (); }
uint64 playerGUID; uint64 PlayerGUID;
uint64 ardonisGUID; uint64 ardonisGUID;
uint64 pathaleonGUID; uint64 pathaleonGUID;
@@ -379,7 +379,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
void Reset() void Reset()
{ {
playerGUID = 0; PlayerGUID = 0;
ardonisGUID = 0; ardonisGUID = 0;
pathaleonGUID = 0; pathaleonGUID = 0;
@@ -401,9 +401,9 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
{ {
Creature *ardonis = Unit::GetCreature(*m_creature,ardonisGUID); Creature *ardonis = Unit::GetCreature(*m_creature,ardonisGUID);
Creature *pathaleon = Unit::GetCreature(*m_creature,pathaleonGUID); Creature *pathaleon = Unit::GetCreature(*m_creature,pathaleonGUID);
Player *player = Unit::GetPlayer(playerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (!ardonis || !pathaleon || !player) if (!ardonis || !pathaleon || !pPlayer)
return; return;
//Calculate the angle to Pathaleon //Calculate the angle to Pathaleon
@@ -412,10 +412,10 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
//Turn Dawnforge and update //Turn Dawnforge and update
m_creature->SetOrientation(angle_dawnforge); m_creature->SetOrientation(angle_dawnforge);
m_creature->SendUpdateToPlayer(player); m_creature->SendUpdateToPlayer(pPlayer);
//Turn Ardonis and update //Turn Ardonis and update
ardonis->SetOrientation(angle_ardonis); ardonis->SetOrientation(angle_ardonis);
ardonis->SendUpdateToPlayer(player); ardonis->SendUpdateToPlayer(pPlayer);
//Set them to kneel //Set them to kneel
m_creature->SetStandState(UNIT_STAND_STATE_KNEEL); m_creature->SetStandState(UNIT_STAND_STATE_KNEEL);
@@ -427,9 +427,9 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
{ {
if (Unit *ardonis = Unit::GetUnit(*m_creature,ardonisGUID)) if (Unit *ardonis = Unit::GetUnit(*m_creature,ardonisGUID))
{ {
Player *player = Unit::GetPlayer(playerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (!player) if (!pPlayer)
return; return;
angle_dawnforge = m_creature->GetAngle(ardonis->GetPositionX(), ardonis->GetPositionY()); angle_dawnforge = m_creature->GetAngle(ardonis->GetPositionX(), ardonis->GetPositionY());
@@ -437,10 +437,10 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
//Turn Dawnforge and update //Turn Dawnforge and update
m_creature->SetOrientation(angle_dawnforge); m_creature->SetOrientation(angle_dawnforge);
m_creature->SendUpdateToPlayer(player); m_creature->SendUpdateToPlayer(pPlayer);
//Turn Ardonis and update //Turn Ardonis and update
ardonis->SetOrientation(angle_ardonis); ardonis->SetOrientation(angle_ardonis);
ardonis->SendUpdateToPlayer(player); ardonis->SendUpdateToPlayer(pPlayer);
//Set state //Set state
m_creature->SetStandState(UNIT_STAND_STATE_STAND); m_creature->SetStandState(UNIT_STAND_STATE_STAND);
@@ -448,7 +448,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
} }
} }
bool CanStartEvent(Player *player) bool CanStartEvent(Player* pPlayer)
{ {
if (!isEvent) if (!isEvent)
{ {
@@ -457,7 +457,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
return false; return false;
ardonisGUID = ardonis->GetGUID(); ardonisGUID = ardonis->GetGUID();
playerGUID = player->GetGUID(); PlayerGUID = pPlayer->GetGUID();
isEvent = true; isEvent = true;
@@ -484,9 +484,9 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
Unit *ardonis = Unit::GetUnit(*m_creature,ardonisGUID); Unit *ardonis = Unit::GetUnit(*m_creature,ardonisGUID);
Unit *pathaleon = Unit::GetUnit(*m_creature,pathaleonGUID); Unit *pathaleon = Unit::GetUnit(*m_creature,pathaleonGUID);
Player *player = Unit::GetPlayer(playerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (!ardonis || !player) if (!ardonis || !pPlayer)
{ {
Reset(); Reset();
return; return;
@@ -594,7 +594,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
//Phase 10 Dawnforge say //Phase 10 Dawnforge say
case 10: case 10:
DoScriptText(SAY_COMMANDER_DAWNFORGE_5, m_creature); DoScriptText(SAY_COMMANDER_DAWNFORGE_5, m_creature);
player->AreaExploredOrEventHappens(QUEST_INFO_GATHERING); pPlayer->AreaExploredOrEventHappens(QUEST_INFO_GATHERING);
Reset(); Reset();
break; break;
} }
@@ -606,20 +606,20 @@ CreatureAI* GetAI_npc_commander_dawnforge(Creature* _Creature)
return new npc_commander_dawnforgeAI(_Creature); return new npc_commander_dawnforgeAI(_Creature);
} }
bool AreaTrigger_at_commander_dawnforge(Player *player, AreaTriggerEntry *at) bool AreaTrigger_at_commander_dawnforge(Player* pPlayer, AreaTriggerEntry *at)
{ {
//if player lost aura or not have at all, we should not try start event. //if player lost aura or not have at all, we should not try start event.
if (!player->HasAura(SPELL_SUNFURY_DISGUISE)) if (!pPlayer->HasAura(SPELL_SUNFURY_DISGUISE))
return false; return false;
if (player->isAlive() && player->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE) if (pPlayer->isAlive() && pPlayer->GetQuestStatus(QUEST_INFO_GATHERING) == QUEST_STATUS_INCOMPLETE)
{ {
Creature* Dawnforge = player->FindNearestCreature(CreatureEntry[1], 30.0f); Creature* Dawnforge = pPlayer->FindNearestCreature(CreatureEntry[1], 30.0f);
if (!Dawnforge) if (!Dawnforge)
return false; return false;
if(CAST_AI(npc_commander_dawnforgeAI, Dawnforge->AI())->CanStartEvent(player)) if (CAST_AI(npc_commander_dawnforgeAI, Dawnforge->AI())->CanStartEvent(pPlayer))
return true; return true;
} }
return false; return false;
@@ -636,34 +636,34 @@ bool AreaTrigger_at_commander_dawnforge(Player *player, AreaTriggerEntry *at)
#define QUEST_DIMENSIUS 10439 #define QUEST_DIMENSIUS 10439
#define QUEST_ON_NETHERY_WINGS 10438 #define QUEST_ON_NETHERY_WINGS 10438
bool GossipHello_npc_professor_dabiri(Player *player, Creature *_Creature) bool GossipHello_npc_professor_dabiri(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if(player->GetQuestStatus(QUEST_ON_NETHERY_WINGS) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(29778, 1)) if (pPlayer->GetQuestStatus(QUEST_ON_NETHERY_WINGS) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(29778, 1))
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_professor_dabiri(Player *player, Creature *_Creature, uint32 sender, uint32 action ) bool GossipSelect_npc_professor_dabiri(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
if (action == GOSSIP_ACTION_INFO_DEF+1) if (action == GOSSIP_ACTION_INFO_DEF+1)
{ {
_Creature->CastSpell(player, SPELL_PHASE_DISTRUPTOR, false); _Creature->CastSpell(pPlayer, SPELL_PHASE_DISTRUPTOR, false);
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
} }
return true; return true;
} }
bool QuestAccept_npc_professor_dabiri(Player *player, Creature *creature, Quest const *quest ) bool QuestAccept_npc_professor_dabiri(Player* pPlayer, Creature *creature, Quest const *quest)
{ {
if (quest->GetQuestId() == QUEST_DIMENSIUS) if (quest->GetQuestId() == QUEST_DIMENSIUS)
DoScriptText(WHISPER_DABIRI, creature, player); DoScriptText(WHISPER_DABIRI, creature, pPlayer);
return true; return true;
} }
@@ -710,8 +710,8 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI
void EnterCombat(Unit *who) void EnterCombat(Unit *who)
{ {
if(Player *player = who->GetCharmerOrOwnerPlayerOrPlayerItself()) if (Player* pPlayer = who->GetCharmerOrOwnerPlayerOrPlayerItself())
PlayerGUID = player->GetGUID(); PlayerGUID = pPlayer->GetGUID();
} }
void SpellHit(Unit *caster, const SpellEntry *spell) void SpellHit(Unit *caster, const SpellEntry *spell)
@@ -809,16 +809,16 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI
{ {
if (PlayerGUID) if (PlayerGUID)
{ {
if (Player* player = Unit::GetPlayer(PlayerGUID)) if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
CAST_PLR(player)->FailQuest(Q_ALMABTRIEB); CAST_PLR(pPlayer)->FailQuest(Q_ALMABTRIEB);
} }
} }
void WaypointReached(uint32 i) void WaypointReached(uint32 i)
{ {
Player* player = Unit::GetPlayer(PlayerGUID); Player* pPlayer = Unit::GetPlayer(PlayerGUID);
if (!player) if (!pPlayer)
return; return;
switch(i) switch(i)
@@ -835,9 +835,9 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI
break; break;
case 12: case 12:
if (player) if (pPlayer)
{ {
CAST_PLR(player)->GroupEventHappens(Q_ALMABTRIEB, m_creature); CAST_PLR(pPlayer)->GroupEventHappens(Q_ALMABTRIEB, m_creature);
Completed = true; Completed = true;
} }
{Unit* Thadell = me->FindNearestCreature(N_THADELL, 30); {Unit* Thadell = me->FindNearestCreature(N_THADELL, 30);
@@ -846,7 +846,7 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI
case 13: case 13:
{Unit* Thadell = me->FindNearestCreature(N_THADELL, 30); {Unit* Thadell = me->FindNearestCreature(N_THADELL, 30);
if (Thadell) if (Thadell)
DoScriptText(SAY_THADELL_2, m_creature, player);}break; DoScriptText(SAY_THADELL_2, m_creature, pPlayer);}break;
} }
} }
@@ -870,13 +870,13 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI
}; };
bool QuestAccept_npc_bessy(Player* player, Creature* creature, Quest const* quest) bool QuestAccept_npc_bessy(Player* pPlayer, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == Q_ALMABTRIEB) if (quest->GetQuestId() == Q_ALMABTRIEB)
{ {
creature->setFaction(113); creature->setFaction(113);
creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, pPlayer->GetGUID());
} }
return true; return true;
} }
src/bindings/scripts/scripts/zone/nexus/eye_of_eternity/instance_eye_of_eternity.cpp
+3 -3
View File
@@ -3,12 +3,12 @@
struct TRINITY_DLL_DECL instance_eye_of_eternity : public ScriptedInstance struct TRINITY_DLL_DECL instance_eye_of_eternity : public ScriptedInstance
{ {
instance_eye_of_eternity(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_eye_of_eternity(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
}; };
InstanceData* GetInstanceData_instance_eye_of_eternity(Map* map) InstanceData* GetInstanceData_instance_eye_of_eternity(Map* pMap)
{ {
return new instance_eye_of_eternity(map); return new instance_eye_of_eternity(pMap);
} }
void AddSC_instance_eye_of_eternity() void AddSC_instance_eye_of_eternity()
src/bindings/scripts/scripts/zone/nexus/nexus/boss_anomalus.cpp
+3 -3
View File
@@ -107,10 +107,10 @@ struct TRINITY_DLL_DECL boss_anomalusAI : public ScriptedAI
AchievementEntry const *AchievChaosTheory = GetAchievementStore()->LookupEntry(ACHIEVEMENT_CHAOS_THEORY); AchievementEntry const *AchievChaosTheory = GetAchievementStore()->LookupEntry(ACHIEVEMENT_CHAOS_THEORY);
if (AchievChaosTheory) if (AchievChaosTheory)
{ {
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
if(map && map->IsDungeon()) if (pMap && pMap->IsDungeon())
{ {
Map::PlayerList const &players = map->GetPlayers(); Map::PlayerList const &players = pMap->GetPlayers();
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievChaosTheory); itr->getSource()->CompletedAchievement(AchievChaosTheory);
} }
src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp
+3 -3
View File
@@ -106,10 +106,10 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI
AchievementEntry const *AchievIntenseCold = GetAchievementStore()->LookupEntry(ACHIEVEMENT_INTENSE_COLD); AchievementEntry const *AchievIntenseCold = GetAchievementStore()->LookupEntry(ACHIEVEMENT_INTENSE_COLD);
if (AchievIntenseCold) if (AchievIntenseCold)
{ {
Map *map = m_creature->GetMap(); Map* pMap = m_creature->GetMap();
if(map && map->IsDungeon()) if (pMap && pMap->IsDungeon())
{ {
Map::PlayerList const &players = map->GetPlayers(); Map::PlayerList const &players = pMap->GetPlayers();
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
itr->getSource()->CompletedAchievement(AchievIntenseCold); itr->getSource()->CompletedAchievement(AchievIntenseCold);
} }
src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp
+3 -3
View File
@@ -28,7 +28,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance
{ {
instance_nexus(Map *Map) : ScriptedInstance(Map) { Initialize(); } instance_nexus(Map* pMap) : ScriptedInstance(pMap) { Initialize(); }
uint32 Encounters[NUMBER_OF_ENCOUNTERS]; uint32 Encounters[NUMBER_OF_ENCOUNTERS];
@@ -243,9 +243,9 @@ struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_nexus(Map* map) InstanceData* GetInstanceData_instance_nexus(Map* pMap)
{ {
return new instance_nexus(map); return new instance_nexus(pMap);
} }
void AddSC_instance_nexus() void AddSC_instance_nexus()
src/bindings/scripts/scripts/zone/nexus/oculus/instance_oculus.cpp
+3 -3
View File
@@ -3,12 +3,12 @@
struct TRINITY_DLL_DECL instance_oculus : public ScriptedInstance struct TRINITY_DLL_DECL instance_oculus : public ScriptedInstance
{ {
instance_oculus(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_oculus(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
}; };
InstanceData* GetInstanceData_instance_oculus(Map* map) InstanceData* GetInstanceData_instance_oculus(Map* pMap)
{ {
return new instance_oculus(map); return new instance_oculus(pMap);
} }
void AddSC_instance_oculus() void AddSC_instance_oculus()
src/bindings/scripts/scripts/zone/obsidian_sanctum/instance_obsidian_sanctum.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
struct TRINITY_DLL_DECL instance_obsidian_sanctum : public ScriptedInstance struct TRINITY_DLL_DECL instance_obsidian_sanctum : public ScriptedInstance
{ {
instance_obsidian_sanctum(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_obsidian_sanctum(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint32 m_uiEncounter[ENCOUNTERS]; uint32 m_uiEncounter[ENCOUNTERS];
uint64 m_uiSartharionGUID; uint64 m_uiSartharionGUID;
@@ -83,9 +83,9 @@ struct TRINITY_DLL_DECL instance_obsidian_sanctum : public ScriptedInstance
} }
}; };
InstanceData* GetInstanceData_instance_obsidian_sanctum(Map* map) InstanceData* GetInstanceData_instance_obsidian_sanctum(Map* pMap)
{ {
return new instance_obsidian_sanctum(map); return new instance_obsidian_sanctum(pMap);
} }
void AddSC_instance_obsidian_sanctum() void AddSC_instance_obsidian_sanctum()
src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp
+35 -35
View File
@@ -37,29 +37,29 @@ EndContentData */
#define GOSSIP_HNF "You may speak frankly, Neeru..." #define GOSSIP_HNF "You may speak frankly, Neeru..."
#define GOSSIP_SNF "[PH] ..." #define GOSSIP_SNF "[PH] ..."
bool GossipHello_npc_neeru_fireblade(Player *player, Creature *_Creature) bool GossipHello_npc_neeru_fireblade(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (player->GetQuestStatus(QUEST_5727) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(QUEST_5727) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(4513, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4513, _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_neeru_fireblade(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_neeru_fireblade(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(4513, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(4513, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(QUEST_5727); pPlayer->AreaExploredOrEventHappens(QUEST_5727);
break; break;
} }
return true; return true;
@@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI
bool CanEmote; bool CanEmote;
uint32 Salute_Timer; uint32 Salute_Timer;
uint32 Reset_Timer; uint32 Reset_Timer;
uint64 playerGUID; uint64 PlayerGUID;
void Reset() void Reset()
{ {
@@ -90,7 +90,7 @@ struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI
CanEmote = false; CanEmote = false;
Salute_Timer = 6000; Salute_Timer = 6000;
Reset_Timer = 0; Reset_Timer = 0;
playerGUID = 0; PlayerGUID = 0;
} }
void EnterCombat(Unit* who) { } void EnterCombat(Unit* who) { }
@@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL npc_shenthulAI : public ScriptedAI
{ {
if (Reset_Timer < diff) if (Reset_Timer < diff)
{ {
if (Player* pPlayer = Unit::GetPlayer(playerGUID)) if (Player* pPlayer = Unit::GetPlayer(PlayerGUID))
{ {
if (pPlayer->GetTypeId() == TYPEID_PLAYER && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetTypeId() == TYPEID_PLAYER && pPlayer->GetQuestStatus(QUEST_SHATTERED_SALUTE) == QUEST_STATUS_INCOMPLETE)
pPlayer->FailQuest(QUEST_SHATTERED_SALUTE); pPlayer->FailQuest(QUEST_SHATTERED_SALUTE);
@@ -144,12 +144,12 @@ CreatureAI* GetAI_npc_shenthul(Creature *_Creature)
return new npc_shenthulAI (_Creature); return new npc_shenthulAI (_Creature);
} }
bool QuestAccept_npc_shenthul(Player* player, Creature* creature, Quest const* quest) bool QuestAccept_npc_shenthul(Player* pPlayer, Creature* creature, Quest const* quest)
{ {
if (quest->GetQuestId() == QUEST_SHATTERED_SALUTE) if (quest->GetQuestId() == QUEST_SHATTERED_SALUTE)
{ {
CAST_AI(npc_shenthulAI, creature->AI())->CanTalk = true; CAST_AI(npc_shenthulAI, creature->AI())->CanTalk = true;
CAST_AI(npc_shenthulAI, creature->AI())->playerGUID = player->GetGUID(); CAST_AI(npc_shenthulAI, creature->AI())->PlayerGUID = pPlayer->GetGUID();
} }
return true; return true;
} }
@@ -212,49 +212,49 @@ CreatureAI* GetAI_npc_thrall_warchief(Creature *_Creature)
return new npc_thrall_warchiefAI (_Creature); return new npc_thrall_warchiefAI (_Creature);
} }
bool GossipHello_npc_thrall_warchief(Player *player, Creature *_Creature) bool GossipHello_npc_thrall_warchief(Player* pPlayer, Creature *_Creature)
{ {
if (_Creature->isQuestGiver()) if (_Creature->isQuestGiver())
player->PrepareQuestMenu( _Creature->GetGUID() ); pPlayer->PrepareQuestMenu(_Creature->GetGUID());
if (player->GetQuestStatus(QUEST_6566) == QUEST_STATUS_INCOMPLETE) if (pPlayer->GetQuestStatus(QUEST_6566) == QUEST_STATUS_INCOMPLETE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HTW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HTW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
return true; return true;
} }
bool GossipSelect_npc_thrall_warchief(Player *player, Creature *_Creature, uint32 sender, uint32 action) bool GossipSelect_npc_thrall_warchief(Player* pPlayer, Creature *_Creature, uint32 sender, uint32 action)
{ {
switch (action) switch (action)
{ {
case GOSSIP_ACTION_INFO_DEF+1: case GOSSIP_ACTION_INFO_DEF+1:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
player->SEND_GOSSIP_MENU(5733, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5733, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+2: case GOSSIP_ACTION_INFO_DEF+2:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
player->SEND_GOSSIP_MENU(5734, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5734, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+3: case GOSSIP_ACTION_INFO_DEF+3:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
player->SEND_GOSSIP_MENU(5735, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5735, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+4: case GOSSIP_ACTION_INFO_DEF+4:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
player->SEND_GOSSIP_MENU(5736, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5736, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+5: case GOSSIP_ACTION_INFO_DEF+5:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6);
player->SEND_GOSSIP_MENU(5737, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5737, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+6: case GOSSIP_ACTION_INFO_DEF+6:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_STW6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7);
player->SEND_GOSSIP_MENU(5738, _Creature->GetGUID()); pPlayer->SEND_GOSSIP_MENU(5738, _Creature->GetGUID());
break; break;
case GOSSIP_ACTION_INFO_DEF+7: case GOSSIP_ACTION_INFO_DEF+7:
player->CLOSE_GOSSIP_MENU(); pPlayer->CLOSE_GOSSIP_MENU();
player->AreaExploredOrEventHappens(QUEST_6566); pPlayer->AreaExploredOrEventHappens(QUEST_6566);
break; break;
} }
return true; return true;
src/bindings/scripts/scripts/zone/razorfen_kraul/instance_razorfen_kraul.cpp
+3 -3
View File
@@ -29,7 +29,7 @@ EndScriptData */
struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance
{ {
instance_razorfen_kraul(Map *map) : ScriptedInstance(map) {Initialize();}; instance_razorfen_kraul(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
uint64 DoorWardGUID; uint64 DoorWardGUID;
uint32 WardCheck_Timer; uint32 WardCheck_Timer;
@@ -90,9 +90,9 @@ struct TRINITY_DLL_DECL instance_razorfen_kraul : public ScriptedInstance
}; };
InstanceData* GetInstanceData_instance_razorfen_kraul(Map* map) InstanceData* GetInstanceData_instance_razorfen_kraul(Map* pMap)
{ {
return new instance_razorfen_kraul(map); return new instance_razorfen_kraul(pMap);
} }
void AddSC_instance_razorfen_kraul() void AddSC_instance_razorfen_kraul()

Some files were not shown because too many files have changed in this diff Show More