diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2015-04-05 06:37:26 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2015-04-05 06:37:26 +0200 |
| commit | 7b34fd4b43bfbb2488e6bed33badd52786ac6be7 (patch) | |
| tree | 98be24c0e6a24ce7821fa2275c2d942264454f7d /src | |
| parent | 4359c4c75886ed227b8e14aadc0f37efc23d0341 (diff) | |
Core: Fix warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 11 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 2 | ||||
| -rw-r--r-- | src/server/game/Handlers/MiscHandler.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Handlers/QueryHandler.cpp | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index de6adc04fb1..1cc96b7510b 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6814,8 +6814,8 @@ void ObjectMgr::LoadQuestPOI() return; } - // 0 1 2 3 4 - QueryResult points = WorldDatabase.Query("SELECT QuestID, BlobIndex, Idx1, X, Y FROM quest_poi_points ORDER BY QuestID DESC, Idx1, Idx2"); + // 0 1 2 3 + QueryResult points = WorldDatabase.Query("SELECT QuestID, Idx1, X, Y FROM quest_poi_points ORDER BY QuestID DESC, Idx1, Idx2"); std::vector<std::vector<std::vector<QuestPOIPoint>>> POIs; @@ -6831,10 +6831,9 @@ void ObjectMgr::LoadQuestPOI() fields = points->Fetch(); int32 QuestID = fields[0].GetInt32(); - int32 BlobIndex = fields[1].GetInt32(); - int32 Idx1 = fields[2].GetInt32(); - int32 X = fields[3].GetInt32(); - int32 Y = fields[4].GetInt32(); + int32 Idx1 = fields[1].GetInt32(); + int32 X = fields[2].GetInt32(); + int32 Y = fields[3].GetInt32(); if (POIs[QuestID].size() <= Idx1 + 1) POIs[QuestID].resize(Idx1 + 10); diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 07ff1971a40..57de8720c3d 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -839,7 +839,7 @@ class ObjectMgr return NULL; } - QuestPOIVector const* GetQuestPOIVector(uint32 QuestID) + QuestPOIVector const* GetQuestPOIVector(int32 QuestID) { QuestPOIContainer::const_iterator itr = _questPOIStore.find(QuestID); if (itr != _questPOIStore.end()) diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index cf04bfcbbb1..c9d94a9fe3b 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -1340,7 +1340,7 @@ void WorldSession::HandleCancelMountAuraOpcode(WorldPacket& /*recvData*/) _player->RemoveAurasByType(SPELL_AURA_MOUNTED); // Calls Dismount() } -void WorldSession::HandleMoveSetCanFlyAckOpcode(WorldPacket& recvData) +void WorldSession::HandleMoveSetCanFlyAckOpcode(WorldPacket& /*recvData*/) { // fly mode on/off TC_LOG_DEBUG("network", "WORLD: CMSG_MOVE_SET_CAN_FLY_ACK"); diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index a102123c349..93ae3873857 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -342,7 +342,7 @@ void WorldSession::HandleQuestPOIQuery(WorldPackets::Query::QuestPOIQuery& packe bool questOk = false; - uint16 questSlot = _player->FindQuestSlot(QuestID); + uint16 questSlot = _player->FindQuestSlot(uint32(QuestID)); if (questSlot != MAX_QUEST_LOG_SIZE) questOk = _player->GetQuestSlotQuestId(questSlot) == QuestID; |