diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/collision/Management/MMapManager.cpp | 12 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Handlers/QueryHandler.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/src/server/collision/Management/MMapManager.cpp b/src/server/collision/Management/MMapManager.cpp index b3a012d6a3f..bb752fd9b49 100644 --- a/src/server/collision/Management/MMapManager.cpp +++ b/src/server/collision/Management/MMapManager.cpp @@ -163,13 +163,9 @@ namespace MMAP return true; } - else - { - TC_LOG_ERROR("maps", "MMAP:loadMap: Could not load %03u%02i%02i.mmtile into navmesh", mapId, x, y); - dtFree(data); - return false; - } + TC_LOG_ERROR("maps", "MMAP:loadMap: Could not load %03u%02i%02i.mmtile into navmesh", mapId, x, y); + dtFree(data); return false; } @@ -233,9 +229,9 @@ namespace MMAP for (uint32 i = 0; i < sMapStore.GetNumRows(); ++i) { - if (const MapEntry* const map = sMapStore.LookupEntry(i)) + if (MapEntry const* map = sMapStore.LookupEntry(i)) { - if (map->ParentMapID == mapId) + if (map->ParentMapID == int32(mapId)) { PhasedTile* data = LoadTile(map->ID, x, y); // only a few tiles have terrain swaps, do not write error for them diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 925c0bf76fe..d8b051040a2 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -3316,7 +3316,7 @@ void WorldObject::RebuildTerrainSwaps() { // only add terrain swaps for current map MapEntry const* mapEntry = sMapStore.LookupEntry(swap); - if (!mapEntry || mapEntry->ParentMapID != GetMapId()) + if (!mapEntry || mapEntry->ParentMapID != int32(GetMapId())) continue; conditions = sConditionMgr->GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_TERRAIN_SWAP, swap); diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index a6971966026..1b36904f64f 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -350,7 +350,7 @@ void WorldSession::HandleQuestPOIQuery(WorldPackets::Query::QuestPOIQuery& packe uint16 questSlot = _player->FindQuestSlot(uint32(QuestID)); if (questSlot != MAX_QUEST_LOG_SIZE) - questOk = _player->GetQuestSlotQuestId(questSlot) == QuestID; + questOk = _player->GetQuestSlotQuestId(questSlot) == uint32(QuestID); if (questOk) { diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 956bf6ea882..543b818597e 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -6635,7 +6635,7 @@ void AuraEffect::HandleEnableAltPower(AuraApplication const* aurApp, uint8 mode, aurApp->GetTarget()->SetMaxPower(POWER_ALTERNATE_POWER, 0); } -void AuraEffect::HandleModSpellCategoryCooldown(AuraApplication const* aurApp, uint8 mode, bool apply) const +void AuraEffect::HandleModSpellCategoryCooldown(AuraApplication const* aurApp, uint8 mode, bool /*apply*/) const { if (!(mode & AURA_EFFECT_HANDLE_REAL)) return; |