From 9e0907874e3f461aa5650f7122af880301025b7f Mon Sep 17 00:00:00 2001 From: Nay Date: Mon, 20 Aug 2012 21:54:36 +0100 Subject: [PATCH] Core: Fix 4 warnings / SQL: Rename two SQL files --- ...ql => 2012_08_20_08_world_achievement_criteria_data.sql} | 0 ..._world_disables.sql => 2012_08_20_09_world_disables.sql} | 0 src/server/game/Battlefield/Zones/BattlefieldWG.cpp | 4 ++-- src/tools/vmap4_extractor/mpq_libmpq04.h | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) rename sql/updates/world/{2011_07_05_00_world_achievement_criteria_data.sql => 2012_08_20_08_world_achievement_criteria_data.sql} (100%) rename sql/updates/world/{2011_07_05_00_world_disables.sql => 2012_08_20_09_world_disables.sql} (100%) diff --git a/sql/updates/world/2011_07_05_00_world_achievement_criteria_data.sql b/sql/updates/world/2012_08_20_08_world_achievement_criteria_data.sql similarity index 100% rename from sql/updates/world/2011_07_05_00_world_achievement_criteria_data.sql rename to sql/updates/world/2012_08_20_08_world_achievement_criteria_data.sql diff --git a/sql/updates/world/2011_07_05_00_world_disables.sql b/sql/updates/world/2012_08_20_09_world_disables.sql similarity index 100% rename from sql/updates/world/2011_07_05_00_world_disables.sql rename to sql/updates/world/2012_08_20_09_world_disables.sql diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index c57f2bf059..48d6b59d00 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -574,7 +574,7 @@ void BattlefieldWG::OnCreatureCreate(Creature* creature) } } -void BattlefieldWG::OnCreatureRemove(Creature* creature) +void BattlefieldWG::OnCreatureRemove(Creature* /*creature*/) { /* possibly can be used later if (IsWarTime()) @@ -896,7 +896,7 @@ void BattlefieldWG::SendInitWorldStatesToAll() player->GetSession()->SendPacket(&data); } -void BattlefieldWG::BrokenWallOrTower(TeamId team) +void BattlefieldWG::BrokenWallOrTower(TeamId /*team*/) { // might be some use for this in the future. old code commented out below. KL /* if (team == GetDefenderTeam()) diff --git a/src/tools/vmap4_extractor/mpq_libmpq04.h b/src/tools/vmap4_extractor/mpq_libmpq04.h index ed51022de7..89f715e9e8 100644 --- a/src/tools/vmap4_extractor/mpq_libmpq04.h +++ b/src/tools/vmap4_extractor/mpq_libmpq04.h @@ -24,7 +24,7 @@ public: void close(); void GetFileListTo(vector& filelist) { - uint32 filenum; + uint32_t filenum; if(libmpq__file_number(mpq_a, "(listfile)", &filenum)) return; libmpq__off_t size, transferred; libmpq__file_unpacked_size(mpq_a, filenum, &size); @@ -60,8 +60,8 @@ class MPQFile libmpq__off_t pointer,size; // disable copying - MPQFile(const MPQFile &f) {} - void operator=(const MPQFile &f) {} + MPQFile(const MPQFile& /*f*/) {} + void operator=(const MPQFile& /*f*/) {} public: MPQFile(const char* filename); // filenames are not case sensitive