diff options
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/areatrigger_scripts.cpp | 10 | ||||
| -rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/World/mob_generic_creature.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/World/npc_professions.cpp | 8 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 2 |
5 files changed, 13 insertions, 11 deletions
diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index f2c86b461eb..45750a826b9 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -95,7 +95,7 @@ class AreaTrigger_at_coilfang_waterfall : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) { if (GameObject* pGo = GetClosestGameObjectWithEntry(player, GO_COILFANG_WATERFALL, 35.0f)) if (pGo->getLootState() == GO_READY) @@ -127,7 +127,7 @@ class AreaTrigger_at_legion_teleporter : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) { if (player->isAlive() && !player->isInCombat()) { @@ -164,7 +164,7 @@ class AreaTrigger_at_ravenholdt : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) { if (player->GetQuestStatus(QUEST_MANOR_RAVENHOLDT) == QUEST_STATUS_INCOMPLETE) player->KilledMonsterCredit(NPC_RAVENHOLDT, 0); @@ -234,7 +234,7 @@ class AreaTrigger_at_stormwright_shelf : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) { if (!player->isDead() && player->GetQuestStatus(QUEST_STRENGTH_OF_THE_TEMPEST) == QUEST_STATUS_INCOMPLETE) player->CastSpell(player, SPELL_CREATE_TRUE_POWER_OF_THE_TEMPEST, false); @@ -262,7 +262,7 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript { } - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger) + bool OnTrigger(Player* player, AreaTriggerEntry const* /*trigger*/) { if (!player->isDead() && player->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE) { diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index a13a682ea86..474f5207ead 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1176,7 +1176,7 @@ class go_massive_seaforium_charge : public GameObjectScript public: go_massive_seaforium_charge() : GameObjectScript("go_massive_seaforium_charge") { } - bool OnGossipHello(Player* pPlayer, GameObject *pGo) + bool OnGossipHello(Player* /*pPlayer*/, GameObject *pGo) { pGo->SetLootState(GO_JUST_DEACTIVATED); return true; diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp index 4e87e38716b..0b1317f9b99 100644 --- a/src/server/scripts/World/mob_generic_creature.cpp +++ b/src/server/scripts/World/mob_generic_creature.cpp @@ -62,6 +62,7 @@ public: //Buff timer (only buff when we are alive and not in combat if (!me->isInCombat() && me->isAlive()) + { if (BuffTimer <= diff) { //Find a spell that targets friendly and applies an aura (these are generally buffs) @@ -80,6 +81,7 @@ public: }//Try agian in 30 seconds else BuffTimer = 30000; } else BuffTimer -= diff; + } //Return since we have no target if (!UpdateVictim()) diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index 930c70fafe3..6a7357b35cc 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -185,17 +185,17 @@ there is no difference here (except that default text is chosen with `gameobject # formulas to calculate unlearning cost ###*/ -int32 DoLearnCost(Player* /*pPlayer*/) //tailor, alchemy +uint32 DoLearnCost(Player* /*pPlayer*/) //tailor, alchemy { return 200000; } -int32 DoHighUnlearnCost(Player* /*pPlayer*/) //tailor, alchemy +uint32 DoHighUnlearnCost(Player* /*pPlayer*/) //tailor, alchemy { return 1500000; } -int32 DoMedUnlearnCost(Player* pPlayer) //blacksmith, leatherwork +uint32 DoMedUnlearnCost(Player* pPlayer) //blacksmith, leatherwork { uint8 level = pPlayer->getLevel(); if (level < 51) @@ -206,7 +206,7 @@ int32 DoMedUnlearnCost(Player* pPlayer) //blacksmith, leath return 1000000; } -int32 DoLowUnlearnCost(Player* pPlayer) //blacksmith +uint32 DoLowUnlearnCost(Player* pPlayer) //blacksmith { uint8 level = pPlayer->getLevel(); if (level < 66) diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index be38b41ccf4..b5e472763ab 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -634,7 +634,7 @@ public: Reset(); } - void PatientSaved(Creature* soldier, Player* pPlayer, Location* Point) + void PatientSaved(Creature* /*soldier*/, Player* pPlayer, Location* Point) { if (pPlayer && PlayerGUID == pPlayer->GetGUID()) { |