diff options
| -rw-r--r-- | src/server/game/AI/CoreAI/GameObjectAI.h | 6 | ||||
| -rwxr-xr-x | src/server/game/Entities/GameObject/GameObject.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Entities/GameObject/GameObject.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Guilds/Guild.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Server/Protocol/Handlers/MiscHandler.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/AI/CoreAI/GameObjectAI.h b/src/server/game/AI/CoreAI/GameObjectAI.h index 144ded86f80..631b61a9250 100644 --- a/src/server/game/AI/CoreAI/GameObjectAI.h +++ b/src/server/game/AI/CoreAI/GameObjectAI.h @@ -33,7 +33,7 @@ class GameObjectAI explicit GameObjectAI(GameObject *g) : go(g) {} virtual ~GameObjectAI() {} - virtual void UpdateAI(const uint32 diff) {} + virtual void UpdateAI(const uint32 /*diff*/) {} virtual void InitializeAI() { Reset(); } @@ -47,8 +47,8 @@ class NullGameObjectAI : public GameObjectAI public: explicit NullGameObjectAI(GameObject *g); - void UpdateAI(const uint32) {} + void UpdateAI(const uint32 /*diff*/) {} - static int Permissible(const GameObject* go) { return PERMIT_BASE_IDLE; } + static int Permissible(const GameObject* /*go*/) { return PERMIT_BASE_IDLE; } }; #endif diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index f13108bab4e..eb9a25b17cc 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -896,13 +896,13 @@ bool GameObject::ActivateToQuest(Player *pTarget) const } case GAMEOBJECT_TYPE_GENERIC: { - if (pTarget->GetQuestStatus(GetGOInfo()->_generic.questID) == QUEST_STATUS_INCOMPLETE || GetGOInfo()->_generic.questID == -1) + if (GetGOInfo()->_generic.questID == -1 || pTarget->GetQuestStatus(GetGOInfo()->_generic.questID) == QUEST_STATUS_INCOMPLETE) return true; break; } case GAMEOBJECT_TYPE_GOOBER: { - if (pTarget->GetQuestStatus(GetGOInfo()->goober.questId) == QUEST_STATUS_INCOMPLETE || GetGOInfo()->goober.questId == -1) + if (GetGOInfo()->goober.questId == -1 || pTarget->GetQuestStatus(GetGOInfo()->goober.questId) == QUEST_STATUS_INCOMPLETE) return true; break; } diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 862fa3524bb..5da1fceae21 100755 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -120,7 +120,7 @@ struct GameObjectInfo uint32 serverOnly; //2 uint32 large; //3 uint32 floatOnWater; //4 - uint32 questID; //5 + int32 questID; //5 } _generic; //6 GAMEOBJECT_TYPE_TRAP struct diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 82ac6d13acb..651ffdec636 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -7934,7 +7934,7 @@ void ObjectMgr::LoadGameObjectForQuests() } case GAMEOBJECT_TYPE_GENERIC: { - if (goInfo->_generic.questID) //quests objects + if (goInfo->_generic.questID > 0) //quests objects { mGameObjectForQuestSet.insert(go_entry); count++; @@ -7943,7 +7943,7 @@ void ObjectMgr::LoadGameObjectForQuests() } case GAMEOBJECT_TYPE_GOOBER: { - if (goInfo->goober.questId) //quests objects + if (goInfo->goober.questId > 0) //quests objects { mGameObjectForQuestSet.insert(go_entry); count++; diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 5aca8da89f1..91c77543c92 100755 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -2674,7 +2674,7 @@ void Guild::_SendBankContentUpdate(MoveItemData* pSrc, MoveItemData* pDest) cons { ASSERT(pSrc->IsBank() || pDest->IsBank()); - uint8 tabId; + uint8 tabId = 0; SlotIds slots; if (pSrc->IsBank()) // B -> { diff --git a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp index 1d3e72e68bd..3c5e3d2b06e 100755 --- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp @@ -1717,7 +1717,7 @@ void WorldSession::SendSetPhaseShift(uint32 PhaseShift) SendPacket(&data); } -void WorldSession::HandleHearthAndResurrect(WorldPacket &recv_data) +void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recv_data*/) { if (_player->isInFlight()) return; |