Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 03:12:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Warning fixes and some random cleanup here and there

Browse Source
This commit is contained in:
Spp
2012-03-07 14:08:30 +01:00
parent e5d23103f3
commit f495e0efe4
123 changed files with 682 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/World/areatrigger_scripts.cpp
View File

@@ -447,7 +447,7 @@ class AreaTrigger_at_area_52_entrance : public AreaTriggerScript
bool OnTrigger(Player* player, AreaTriggerEntry const* trigger)
{
float x, y, z;
float x = 0.0f, y = 0.0f, z = 0.0f;
if (!player->isAlive())
return false;
@@ -502,4 +502,4 @@ void AddSC_areatrigger_scripts()
new AreaTrigger_at_bring_your_orphan_to();
new AreaTrigger_at_brewfest();
new AreaTrigger_at_area_52_entrance();
}
}

12
src/server/scripts/World/go_scripts.cpp
View File

@@ -564,10 +564,10 @@ public:
return true;
}
bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF:
player->CastSpell(player, SPELL_CREATE_1_FLASK_OF_BEAST, false);
@@ -623,10 +623,10 @@ public:
return true;
}
bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF:
player->CastSpell(player, SPELL_CREATE_1_FLASK_OF_SORCERER, false);
@@ -1087,10 +1087,10 @@ public:
return true;
}
bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, GameObject* pGO, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF +1)
if (action == GOSSIP_ACTION_INFO_DEF +1)
{
player->CLOSE_GOSSIP_MENU();
Creature* target = GetClosestCreatureWithEntry(player, NPC_OUTHOUSE_BUNNY, 3.0f);

1
src/server/scripts/World/guards.cpp
View File

@@ -177,7 +177,6 @@ public:
//Set our global cooldown
globalCooldown = GENERIC_CREATURE_COOLDOWN;
} //If no spells available and we arn't moving run to target
else if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
{

14
src/server/scripts/World/item_scripts.cpp
View File

@@ -64,8 +64,8 @@ public:
disabled = true;
break;
case 34475:
if (const SpellInfo* pSpellInfo = sSpellMgr->GetSpellInfo(SPELL_ARCANE_CHARGES))
Spell::SendCastResult(player, pSpellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(SPELL_ARCANE_CHARGES))
Spell::SendCastResult(player, spellInfo, 1, SPELL_FAILED_NOT_ON_GROUND);
break;
}
@@ -264,7 +264,7 @@ class item_petrov_cluster_bombs : public ItemScript
public:
item_petrov_cluster_bombs() : ItemScript("item_petrov_cluster_bombs") { }
bool OnUse(Player* player, Item* pItem, const SpellCastTargets & /*pTargets*/)
bool OnUse(Player* player, Item* pItem, const SpellCastTargets & /*targets*/)
{
if (player->GetZoneId() != ZONE_ID_HOWLING)
return false;
@@ -273,8 +273,8 @@ public:
{
player->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
if (const SpellInfo* pSpellInfo = sSpellMgr->GetSpellInfo(SPELL_PETROV_BOMB))
Spell::SendCastResult(player, pSpellInfo, 1, SPELL_FAILED_NOT_HERE);
if (const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(SPELL_PETROV_BOMB))
Spell::SendCastResult(player, spellInfo, 1, SPELL_FAILED_NOT_HERE);
return true;
}
@@ -330,7 +330,7 @@ class item_dehta_trap_smasher : public ItemScript
public:
item_dehta_trap_smasher() : ItemScript("item_dehta_trap_smasher") { }
bool OnUse(Player* player, Item* /*pItem*/, const SpellCastTargets & /*pTargets*/)
bool OnUse(Player* player, Item* /*pItem*/, const SpellCastTargets & /*targets*/)
{
if (player->GetQuestStatus(QUEST_CANNOT_HELP_THEMSELVES) != QUEST_STATUS_INCOMPLETE)
return false;
@@ -367,7 +367,7 @@ class item_trident_of_nazjan : public ItemScript
public:
item_trident_of_nazjan() : ItemScript("item_Trident_of_Nazjan") { }
bool OnUse(Player* player, Item* pItem, const SpellCastTargets & /*pTargets*/)
bool OnUse(Player* player, Item* pItem, const SpellCastTargets & /*targets*/)
{
if (player->GetQuestStatus(QUEST_THE_EMISSARY) == QUEST_STATUS_INCOMPLETE)
{

6
src/server/scripts/World/npc_innkeeper.cpp
View File

@@ -79,10 +79,10 @@ public:
return true;
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && IsEventActive(HALLOWEEN_EVENTID) && !player->HasAura(SPELL_TRICK_OR_TREATED))
if (action == GOSSIP_ACTION_INFO_DEF+HALLOWEEN_EVENTID && IsEventActive(HALLOWEEN_EVENTID) && !player->HasAura(SPELL_TRICK_OR_TREATED))
{
player->CastSpell(player, SPELL_TRICK_OR_TREATED, true);
@@ -116,7 +116,7 @@ public:
player->CLOSE_GOSSIP_MENU();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_TRADE: player->GetSession()->SendListInventory(creature->GetGUID()); break;
case GOSSIP_ACTION_INN: player->SetBindPoint(creature->GetGUID()); break;

162
src/server/scripts/World/npc_professions.cpp
View File

@@ -213,7 +213,7 @@ int32 DoLowUnlearnCost(Player* player) //blacksmith
return 100000;
}
void ProcessCastAction(Player* player, Creature* creature, uint32 spellId, uint32 triggeredSpellId, int32 cost)
void ProcessCastaction(Player* player, Creature* creature, uint32 spellId, uint32 triggeredSpellId, int32 cost)
{
if (!(spellId && player->HasSpell(spellId)) && player->HasEnoughMoney(cost))
{
@@ -424,9 +424,9 @@ public:
return true;
}
void SendActionMenu(Player* player, Creature* creature, uint32 uiAction)
void SendActionMenu(Player* player, Creature* creature, uint32 action)
{
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_TRADE:
player->GetSession()->SendListInventory(creature->GetGUID());
@@ -436,45 +436,45 @@ public:
break;
//Learn Alchemy
case GOSSIP_ACTION_INFO_DEF + 1:
ProcessCastAction(player, creature, S_TRANSMUTE, S_LEARN_TRANSMUTE, DoLearnCost(player));
ProcessCastaction(player, creature, S_TRANSMUTE, S_LEARN_TRANSMUTE, DoLearnCost(player));
break;
case GOSSIP_ACTION_INFO_DEF + 2:
ProcessCastAction(player, creature, S_ELIXIR, S_LEARN_ELIXIR, DoLearnCost(player));
ProcessCastaction(player, creature, S_ELIXIR, S_LEARN_ELIXIR, DoLearnCost(player));
break;
case GOSSIP_ACTION_INFO_DEF + 3:
ProcessCastAction(player, creature, S_POTION, S_LEARN_POTION, DoLearnCost(player));
ProcessCastaction(player, creature, S_POTION, S_LEARN_POTION, DoLearnCost(player));
break;
//Unlearn Alchemy
case GOSSIP_ACTION_INFO_DEF + 4:
ProcessCastAction(player, creature, 0, S_UNLEARN_TRANSMUTE, DoHighUnlearnCost(player));
ProcessCastaction(player, creature, 0, S_UNLEARN_TRANSMUTE, DoHighUnlearnCost(player));
break;
case GOSSIP_ACTION_INFO_DEF + 5:
ProcessCastAction(player, creature, 0, S_UNLEARN_ELIXIR, DoHighUnlearnCost(player));
ProcessCastaction(player, creature, 0, S_UNLEARN_ELIXIR, DoHighUnlearnCost(player));
break;
case GOSSIP_ACTION_INFO_DEF + 6:
ProcessCastAction(player, creature, 0, S_UNLEARN_POTION, DoHighUnlearnCost(player));
ProcessCastaction(player, creature, 0, S_UNLEARN_POTION, DoHighUnlearnCost(player));
break;
}
}
void SendConfirmLearn(Player* player, Creature* creature, uint32 uiAction)
void SendConfirmLearn(Player* player, Creature* creature, uint32 action)
{
if (uiAction)
if (action)
{
switch (creature->GetEntry())
{
case 22427:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 19052:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_ELIXIR, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 17909:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION, GOSSIP_SENDER_CHECK, uiAction);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_POTION, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
@@ -482,24 +482,24 @@ public:
}
}
void SendConfirmUnlearn(Player* player, Creature* creature, uint32 uiAction)
void SendConfirmUnlearn(Player* player, Creature* creature, uint32 action)
{
if (uiAction)
if (action)
{
switch (creature->GetEntry())
{
case 22427: //Zarevhi
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 19052: //Lorokeem
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 17909: //Lauranna Thar'well
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
@@ -507,15 +507,15 @@ public:
}
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiSender)
switch (sender)
{
case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, uiAction); break;
case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, uiAction); break;
case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, action); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, action); break;
}
return true;
}
@@ -599,9 +599,9 @@ public:
return true;
}
void SendActionMenu(Player* player, Creature* creature, uint32 uiAction)
void SendActionMenu(Player* player, Creature* creature, uint32 action)
{
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_TRADE:
player->GetSession()->SendListInventory(creature->GetGUID());
@@ -665,24 +665,24 @@ public:
}
}
void SendConfirmLearn(Player* player, Creature* creature, uint32 uiAction)
void SendConfirmLearn(Player* player, Creature* creature, uint32 action)
{
if (uiAction)
if (action)
{
switch (creature->GetEntry())
{
case 11191:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_HAMMER, GOSSIP_SENDER_CHECK, action);
//unknown textID (TALK_HAMMER_LEARN)
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 11192:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_CHECK, uiAction);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_AXE, GOSSIP_SENDER_CHECK, action);
//unknown textID (TALK_AXE_LEARN)
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 11193:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SWORD, GOSSIP_SENDER_CHECK, action);
//unknown textID (TALK_SWORD_LEARN)
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
@@ -690,9 +690,9 @@ public:
}
}
void SendConfirmUnlearn(Player* player, Creature* creature, uint32 uiAction)
void SendConfirmUnlearn(Player* player, Creature* creature, uint32 action)
{
if (uiAction)
if (action)
{
switch (creature->GetEntry())
{
@@ -700,23 +700,23 @@ public:
case 11178: //Borgosh Corebender
case 5164: //Grumnus Steelshaper
case 11177: //Okothos Ironrager
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(player), false);
//unknown textID (TALK_UNLEARN_AXEORWEAPON)
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 11191:
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player), false);
//unknown textID (TALK_HAMMER_UNLEARN)
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 11192:
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player), false);
//unknown textID (TALK_AXE_UNLEARN)
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 11193:
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(player), false);
//unknown textID (TALK_SWORD_UNLEARN)
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
@@ -724,15 +724,15 @@ public:
}
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiSender)
switch (sender)
{
case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, uiAction); break;
case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, uiAction); break;
case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, action); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, action); break;
}
return true;
}
@@ -824,16 +824,16 @@ public:
return true;
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
if (uiAction == GOSSIP_ACTION_INFO_DEF + 1)
if (action == GOSSIP_ACTION_INFO_DEF + 1)
player->CLOSE_GOSSIP_MENU();
if (uiSender != creature->GetEntry())
if (sender != creature->GetEntry())
return true;
switch (uiSender)
switch (sender)
{
case NPC_ZAP:
player->CastSpell(player, SPELL_LEARN_TO_EVERLOOK, false);
@@ -897,9 +897,9 @@ public:
return true;
}
void SendActionMenu(Player* player, Creature* creature, uint32 uiAction)
void SendActionMenu(Player* player, Creature* creature, uint32 action)
{
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_TRADE:
player->GetSession()->SendListInventory(creature->GetGUID());
@@ -920,27 +920,27 @@ public:
}
}
void SendConfirmUnlearn(Player* player, Creature* creature, uint32 uiAction)
void SendConfirmUnlearn(Player* player, Creature* creature, uint32 action)
{
if (uiAction)
if (action)
{
switch (creature->GetEntry())
{
case 7866: //Peter Galen
case 7867: //Thorkaf Dragoneye
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player), false);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 7868: //Sarah Tanner
case 7869: //Brumn Winterhoof
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player), false);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 7870: //Caryssia Moonhunter
case 7871: //Se'Jib
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(player), false);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
@@ -948,14 +948,14 @@ public:
}
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiSender)
switch (sender)
{
case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, uiAction); break;
case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, uiAction); break;
case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, action); break;
}
return true;
}
@@ -1017,9 +1017,9 @@ public:
return true;
}
void SendActionMenu(Player* player, Creature* creature, uint32 uiAction)
void SendActionMenu(Player* player, Creature* creature, uint32 action)
{
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_TRADE:
player->GetSession()->SendListInventory(creature->GetGUID());
@@ -1029,13 +1029,13 @@ public:
break;
//Learn Tailor
case GOSSIP_ACTION_INFO_DEF + 1:
ProcessCastAction(player, creature, S_SPELLFIRE, S_LEARN_SPELLFIRE, DoLearnCost(player));
ProcessCastaction(player, creature, S_SPELLFIRE, S_LEARN_SPELLFIRE, DoLearnCost(player));
break;
case GOSSIP_ACTION_INFO_DEF + 2:
ProcessCastAction(player, creature, S_MOONCLOTH, S_LEARN_MOONCLOTH, DoLearnCost(player));
ProcessCastaction(player, creature, S_MOONCLOTH, S_LEARN_MOONCLOTH, DoLearnCost(player));
break;
case GOSSIP_ACTION_INFO_DEF + 3:
ProcessCastAction(player, creature, S_SHADOWEAVE, S_LEARN_SHADOWEAVE, DoLearnCost(player));
ProcessCastaction(player, creature, S_SHADOWEAVE, S_LEARN_SHADOWEAVE, DoLearnCost(player));
break;
//Unlearn Tailor
case GOSSIP_ACTION_INFO_DEF + 4:
@@ -1050,24 +1050,24 @@ public:
}
}
void SendConfirmLearn(Player* player, Creature* creature, uint32 uiAction)
void SendConfirmLearn(Player* player, Creature* creature, uint32 action)
{
if (uiAction)
if (action)
{
switch (creature->GetEntry())
{
case 22213:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 22208:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 22212:
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction);
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_LEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
@@ -1075,24 +1075,24 @@ public:
}
}
void SendConfirmUnlearn(Player* player, Creature* creature, uint32 uiAction)
void SendConfirmUnlearn(Player* player, Creature* creature, uint32 action)
{
if (uiAction)
if (action)
{
switch (creature->GetEntry())
{
case 22213: //Gidge Spellweaver
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 22208: //Nasmara Moonsong
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
case 22212: //Andrion Darkspinner
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player), false);
player->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, action, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(player), false);
//unknown textID ()
player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID());
break;
@@ -1100,15 +1100,15 @@ public:
}
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 uiSender, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 sender, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiSender)
switch (sender)
{
case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, uiAction); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, uiAction); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, uiAction); break;
case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, uiAction); break;
case GOSSIP_SENDER_MAIN: SendActionMenu(player, creature, action); break;
case GOSSIP_SENDER_LEARN: SendConfirmLearn(player, creature, action); break;
case GOSSIP_SENDER_UNLEARN: SendConfirmUnlearn(player, creature, action); break;
case GOSSIP_SENDER_CHECK: SendActionMenu(player, creature, action); break;
}
return true;
}

11
src/server/scripts/World/npc_taxi.cpp
View File

@@ -38,7 +38,7 @@ EndScriptData
#define GOSSIP_BRACK2 "Fly me to The Abyssal Shelf"
#define GOSSIP_BRACK3 "Fly me to Spinebreaker Post"
#define GOSSIP_IRENA "Fly me to Skettis please"
#define GOSSIP_CLOUDBREAKER1 "Speaking of uiAction, I've been ordered to undertake an air strike."
#define GOSSIP_CLOUDBREAKER1 "Speaking of action, I've been ordered to undertake an air strike."
#define GOSSIP_CLOUDBREAKER2 "I need to intercept the Dawnblade reinforcements."
#define GOSSIP_DRAGONHAWK "<Ride the dragonhawk to Sun's Reach>"
#define GOSSIP_VERONIA "Fly me to Manaforge Coruu please"
@@ -186,10 +186,10 @@ public:
return true;
}
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action)
{
player->PlayerTalkClass->ClearMenus();
switch (uiAction)
switch (action)
{
case GOSSIP_ACTION_INFO_DEF:
//spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506.
@@ -201,9 +201,10 @@ public:
player->ActivateTaxiPathTo(627); //TaxiPath 627 (possibly 627+628(152->153->154->155))
break;
case GOSSIP_ACTION_INFO_DEF + 2:
if (!player->HasItemCount(25853, 1)) {
if (!player->HasItemCount(25853, 1))
player->SEND_GOSSIP_MENU(9780, creature->GetGUID());
} else {
else
{
player->CLOSE_GOSSIP_MENU();
player->ActivateTaxiPathTo(534); //TaxiPath 534
}

66
src/server/scripts/World/npcs_special.cpp
View File

@@ -1495,7 +1495,6 @@ public:
else
me->SetReactState(REACT_AGGRESSIVE);
}
};
CreatureAI* GetAI(Creature* creature) const
@@ -1754,14 +1753,12 @@ public:
struct mob_mojoAI : public ScriptedAI
{
mob_mojoAI(Creature* c) : ScriptedAI(c) {Reset();}
uint32 Hearts;
uint64 VictimGUID;
uint32 hearts;
uint64 victimGUID;
void Reset()
{
VictimGUID = 0;
Hearts = 15000;
victimGUID = 0;
hearts = 15000;
if (Unit* own = me->GetOwner())
me->GetMotionMaster()->MoveFollow(own, 0, 0);
}
@@ -1772,12 +1769,11 @@ public:
{
if (me->HasAura(20372))
{
if (Hearts <= diff)
if (hearts <= diff)
{
me->RemoveAurasDueToSpell(20372);
Hearts = 15000;
}
Hearts -= diff;
hearts = 15000;
} hearts -= diff;
}
}
@@ -1821,14 +1817,14 @@ public:
}
me->MonsterWhisper(whisp.c_str(), player->GetGUID());
if (VictimGUID)
if (Player* victim = Unit::GetPlayer(*me, VictimGUID))
if (victimGUID)
if (Player* victim = Unit::GetPlayer(*me, victimGUID))
victim->RemoveAura(43906);//remove polymorph frog thing
me->AddAura(43906, player);//add polymorph frog thing
VictimGUID = player->GetGUID();
victimGUID = player->GetGUID();
DoCast(me, 20372, true);//tag.hearts
me->GetMotionMaster()->MoveFollow(player, 0, 0);
Hearts = 15000;
hearts = 15000;
}
}
};
@@ -1894,7 +1890,7 @@ public:
{
npc_ebon_gargoyleAI(Creature* c) : CasterAI(c) {}
uint32 DespawnTimer;
uint32 despawnTimer;
void InitializeAI()
{
@@ -1903,7 +1899,7 @@ public:
if (!ownerGuid)
return;
// Not needed to be despawned now
DespawnTimer = 0;
despawnTimer = 0;
// Find victim of Summon Gargoyle spell
std::list<Unit*> targets;
Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(me, me, 30);
@@ -1952,15 +1948,15 @@ public:
me->GetMotionMaster()->MovePoint(0, x, y, z);
// Despawn as soon as possible
DespawnTimer = 4 * IN_MILLISECONDS;
despawnTimer = 4 * IN_MILLISECONDS;
}
void UpdateAI(const uint32 diff)
{
if (DespawnTimer > 0)
if (despawnTimer > 0)
{
if (DespawnTimer > diff)
DespawnTimer -= diff;
if (despawnTimer > diff)
despawnTimer -= diff;
else
me->DespawnOrUnsummon();
return;
@@ -2021,20 +2017,20 @@ public:
{
npc_training_dummyAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
Entry = creature->GetEntry();
entry = creature->GetEntry();
}
uint32 Entry;
uint32 ResetTimer;
uint32 DespawnTimer;
uint32 entry;
uint32 resetTimer;
uint32 despawnTimer;
void Reset()
{
me->SetControlled(true, UNIT_STATE_STUNNED);//disable rotate
me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);//imune to knock aways like blast wave
ResetTimer = 5000;
DespawnTimer = 15000;
resetTimer = 5000;
despawnTimer = 15000;
}
void EnterEvadeMode()
@@ -2047,13 +2043,13 @@ public:
void DamageTaken(Unit* /*doneBy*/, uint32& damage)
{
ResetTimer = 5000;
resetTimer = 5000;
damage = 0;
}
void EnterCombat(Unit* /*who*/)
{
if (Entry != NPC_ADVANCED_TARGET_DUMMY && Entry != NPC_TARGET_DUMMY)
if (entry != NPC_ADVANCED_TARGET_DUMMY && entry != NPC_TARGET_DUMMY)
return;
}
@@ -2065,23 +2061,23 @@ public:
if (!me->HasUnitState(UNIT_STATE_STUNNED))
me->SetControlled(true, UNIT_STATE_STUNNED);//disable rotate
if (Entry != NPC_ADVANCED_TARGET_DUMMY && Entry != NPC_TARGET_DUMMY)
if (entry != NPC_ADVANCED_TARGET_DUMMY && entry != NPC_TARGET_DUMMY)
{
if (ResetTimer <= diff)
if (resetTimer <= diff)
{
EnterEvadeMode();
ResetTimer = 5000;
resetTimer = 5000;
}
else
ResetTimer -= diff;
resetTimer -= diff;
return;
}
else
{
if (DespawnTimer <= diff)
if (despawnTimer <= diff)
me->DespawnOrUnsummon();
else
DespawnTimer -= diff;
despawnTimer -= diff;
}
}
void MoveInLineOfSight(Unit* /*who*/){return;}