diff options
-rw-r--r-- | sql/updates/world/2013_11_16_00_world_sai.sql (renamed from sql/updates/world/2013_11_16_0_world_sai.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/2013_11_16_01_world_sai.sql (renamed from sql/updates/world/2013_11_16_1_world_sai.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/2013_11_16_02_world_sai.sql (renamed from sql/updates/world/2013_11_16_2_world_sai.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/2013_11_17_00_world_sai.sql (renamed from sql/updates/world/2013_11_17_0_world_sai.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/2013_11_23_00_world_creature_text.sql (renamed from sql/updates/world/2013_11_23_0_world_creature_text.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/2013_11_23_01_world_sai.sql (renamed from sql/updates/world/2013_11_23_1_world_sai.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/2013_11_23_02_world_misc.sql (renamed from sql/updates/world/2013_11_23_2_world_misc.sql) | 0 | ||||
-rw-r--r-- | sql/updates/world/2013_11_24_00_world_spell_script_names.sql (renamed from sql/updates/world/2013_11_24_0_world_spell_script_names.sql) | 0 | ||||
-rw-r--r-- | src/server/game/Handlers/PetHandler.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp | 4 |
10 files changed, 3 insertions, 3 deletions
diff --git a/sql/updates/world/2013_11_16_0_world_sai.sql b/sql/updates/world/2013_11_16_00_world_sai.sql index e953030f396..e953030f396 100644 --- a/sql/updates/world/2013_11_16_0_world_sai.sql +++ b/sql/updates/world/2013_11_16_00_world_sai.sql diff --git a/sql/updates/world/2013_11_16_1_world_sai.sql b/sql/updates/world/2013_11_16_01_world_sai.sql index 33a7550565a..33a7550565a 100644 --- a/sql/updates/world/2013_11_16_1_world_sai.sql +++ b/sql/updates/world/2013_11_16_01_world_sai.sql diff --git a/sql/updates/world/2013_11_16_2_world_sai.sql b/sql/updates/world/2013_11_16_02_world_sai.sql index 7bd096f1a36..7bd096f1a36 100644 --- a/sql/updates/world/2013_11_16_2_world_sai.sql +++ b/sql/updates/world/2013_11_16_02_world_sai.sql diff --git a/sql/updates/world/2013_11_17_0_world_sai.sql b/sql/updates/world/2013_11_17_00_world_sai.sql index 2e36825001f..2e36825001f 100644 --- a/sql/updates/world/2013_11_17_0_world_sai.sql +++ b/sql/updates/world/2013_11_17_00_world_sai.sql diff --git a/sql/updates/world/2013_11_23_0_world_creature_text.sql b/sql/updates/world/2013_11_23_00_world_creature_text.sql index cceca50bb3d..cceca50bb3d 100644 --- a/sql/updates/world/2013_11_23_0_world_creature_text.sql +++ b/sql/updates/world/2013_11_23_00_world_creature_text.sql diff --git a/sql/updates/world/2013_11_23_1_world_sai.sql b/sql/updates/world/2013_11_23_01_world_sai.sql index 97889ce38ad..97889ce38ad 100644 --- a/sql/updates/world/2013_11_23_1_world_sai.sql +++ b/sql/updates/world/2013_11_23_01_world_sai.sql diff --git a/sql/updates/world/2013_11_23_2_world_misc.sql b/sql/updates/world/2013_11_23_02_world_misc.sql index 7193fc68d1a..7193fc68d1a 100644 --- a/sql/updates/world/2013_11_23_2_world_misc.sql +++ b/sql/updates/world/2013_11_23_02_world_misc.sql diff --git a/sql/updates/world/2013_11_24_0_world_spell_script_names.sql b/sql/updates/world/2013_11_24_00_world_spell_script_names.sql index bd72015535e..bd72015535e 100644 --- a/sql/updates/world/2013_11_24_0_world_spell_script_names.sql +++ b/sql/updates/world/2013_11_24_00_world_spell_script_names.sql diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 31d4efc6e27..8c185fe4806 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -144,7 +144,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, uint64 guid1, uint32 spellid CharmInfo* charmInfo = pet->GetCharmInfo(); if (!charmInfo) { - TC_LOG_ERROR("network", "WorldSession::HandlePetAction(petGuid: " UI64FMTD ", tagGuid: " UI64FMTD ", spellId: %u, flag: %u): object (entry: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", + TC_LOG_ERROR("network", "WorldSession::HandlePetAction(petGuid: " UI64FMTD ", tagGuid: " UI64FMTD ", spellId: %u, flag: %u): object (GUID: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", guid1, guid2, spellid, flag, pet->GetGUIDLow(), pet->GetTypeId()); return; } diff --git a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp index f7d57b5bb0d..cd96316acb4 100644 --- a/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp @@ -67,9 +67,9 @@ class npc_apprentice_mirveda : public CreatureScript public: npc_apprentice_mirveda() : CreatureScript("npc_apprentice_mirveda") { } - bool OnQuestReward(Player* player, Creature* creature, const Quest *_Quest, uint32 /*slot*/) OVERRIDE + bool OnQuestReward(Player* /*player*/, Creature* creature, const Quest* quest, uint32 /*slot*/) OVERRIDE { - if (_Quest->GetQuestId() == QUEST_CORRUPTED_SOIL) + if (quest->GetQuestId() == QUEST_CORRUPTED_SOIL) { CAST_AI(npc_apprentice_mirveda::npc_apprentice_mirvedaAI, creature->AI())->me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); CAST_AI(npc_apprentice_mirveda::npc_apprentice_mirvedaAI, creature->AI())->events.ScheduleEvent(EVENT_TALK, 2000); |