Core: Remove some warnings here and there

This commit is contained in:
click
2011-05-13 18:07:12 +02:00
parent 95b085da77
commit b6cf587de9
3 changed files with 31 additions and 29 deletions
+1 -1
View File
@@ -125,7 +125,7 @@ bool ArenaTeam::AddMember(const uint64& playerGuid)
}
// Check if player is already in a similar arena team
if (player && player->GetArenaTeamId(GetSlot()) || Player::GetArenaTeamIdFromDB(playerGuid, GetType()) != 0)
if ((player && player->GetArenaTeamId(GetSlot())) || Player::GetArenaTeamIdFromDB(playerGuid, GetType()) != 0)
{
sLog->outError("Arena: Player %s (guid: %u) already has an arena team of type %u", playerName.c_str(), GUID_LOPART(playerGuid), GetType());
return false;
@@ -493,6 +493,7 @@ inline void KillRewarder::_RewardXP(Player* player, float rate)
{
uint32 xp(_xp);
if (_group)
{
// 4.2.1. If player is in group, adjust XP:
// * set to 0 if player's level is more than maximum level of not gray member;
// * cut XP in half if _isFullXP is false.
@@ -503,6 +504,7 @@ inline void KillRewarder::_RewardXP(Player* player, float rate)
uint32(xp * rate / 2) + 1; // Reward only HALF of XP if some of group members are gray.
else
xp = 0;
}
if (xp)
{
// 4.2.2. Apply auras modifying rewarded XP (SPELL_AURA_MOD_XP_PCT).