josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Warning fixes

Browse Source
This commit is contained in:
Shauren
2015-04-15 12:47:17 +02:00
parent 48578e10fb
commit 7b0c4792ce
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/GameObject/GameObject.cpp
+2 -2
View File
@@ -1101,13 +1101,13 @@ bool GameObject::ActivateToQuest(Player* target) const
}
case GAMEOBJECT_TYPE_GENERIC:
{
if (GetGOInfo()->generic.questID == -1 || target->GetQuestStatus(GetGOInfo()->generic.questID) == QUEST_STATUS_INCOMPLETE)
if (target->GetQuestStatus(GetGOInfo()->generic.questID) == QUEST_STATUS_INCOMPLETE)
return true;
break;
}
case GAMEOBJECT_TYPE_GOOBER:
{
if (GetGOInfo()->goober.questID == -1 || target->GetQuestStatus(GetGOInfo()->goober.questID) == QUEST_STATUS_INCOMPLETE)
if (target->GetQuestStatus(GetGOInfo()->goober.questID) == QUEST_STATUS_INCOMPLETE)
return true;
break;
}
src/server/game/Entities/Player/Player.cpp
+3 -3
View File
@@ -9459,7 +9459,7 @@ uint32 Player::GetXPRestBonus(uint32 xp)
SetRestBonus(GetRestBonus() - rested_bonus);
TC_LOG_DEBUG("entities.player", "GetXPRestBonus: Player %s (%u) gain %u xp (+%u Rested Bonus). Rested points=%f", GetName().c_str(), GetGUID().GetCounter(), xp + rested_bonus, rested_bonus, GetRestBonus());
TC_LOG_DEBUG("entities.player", "GetXPRestBonus: Player %s (%s) gain %u xp (+%u Rested Bonus). Rested points=%f", GetGUID().ToString().c_str(), GetName().c_str(), xp + rested_bonus, rested_bonus, GetRestBonus());
return rested_bonus;
}
@@ -26023,9 +26023,9 @@ uint8 Player::GetNumOfVoidStorageFreeSlots() const
return count;
}
uint8 Player::AddVoidStorageItem(const VoidStorageItem& item)
uint8 Player::AddVoidStorageItem(VoidStorageItem const& item)
{
int8 slot = GetNextVoidStorageFreeSlot();
uint8 slot = GetNextVoidStorageFreeSlot();
if (slot >= VOID_STORAGE_MAX_SLOT)
{
src/server/game/Entities/Player/Player.h
+1 -1
View File
@@ -2617,7 +2617,7 @@ class Player : public Unit, public GridObject<Player>
void LockVoidStorage() { RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_VOID_UNLOCKED); }
uint8 GetNextVoidStorageFreeSlot() const;
uint8 GetNumOfVoidStorageFreeSlots() const;
uint8 AddVoidStorageItem(const VoidStorageItem& item);
uint8 AddVoidStorageItem(VoidStorageItem const& item);
void AddVoidStorageItemAtSlot(uint8 slot, const VoidStorageItem& item);
void DeleteVoidStorageItem(uint8 slot);
bool SwapVoidStorageItem(uint8 oldSlot, uint8 newSlot);
src/server/game/Globals/ObjectMgr.cpp
+1 -1
View File
@@ -5250,7 +5250,7 @@ void ObjectMgr::LoadInstanceEncounters()
continue;
}
if (dungeonEncounter->DifficultyID == -1)
if (!dungeonEncounter->DifficultyID)
{
for (uint32 i = 0; i < MAX_DIFFICULTY; ++i)
{