Core: Fix warnings
--HG-- branch : trunk
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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++;
|
||||
|
||||
@@ -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 ->
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user