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

Core: Remove some warnings here and there

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/ArenaTeam.cpp
+1 -1
View File
@@ -125,7 +125,7 @@ bool ArenaTeam::AddMember(const uint64& playerGuid)
} }
// Check if player is already in a similar arena team // 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()); sLog->outError("Arena: Player %s (guid: %u) already has an arena team of type %u", playerName.c_str(), GUID_LOPART(playerGuid), GetType());
return false; return false;
src/server/game/Entities/Player/Player.cpp
+2
View File
@@ -493,6 +493,7 @@ inline void KillRewarder::_RewardXP(Player* player, float rate)
{ {
uint32 xp(_xp); uint32 xp(_xp);
if (_group) if (_group)
{
// 4.2.1. If player is in group, adjust XP: // 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; // * set to 0 if player's level is more than maximum level of not gray member;
// * cut XP in half if _isFullXP is false. // * 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. uint32(xp * rate / 2) + 1; // Reward only HALF of XP if some of group members are gray.
else else
xp = 0; xp = 0;
}
if (xp) if (xp)
{ {
// 4.2.2. Apply auras modifying rewarded XP (SPELL_AURA_MOD_XP_PCT). // 4.2.2. Apply auras modifying rewarded XP (SPELL_AURA_MOD_XP_PCT).
src/server/shared/Database/PreparedStatement.cpp
+28 -28
View File
@@ -344,34 +344,34 @@ std::string MySQLPreparedStatement::getQueryString(const char *query)
switch (m_stmt->statement_data[i].type) switch (m_stmt->statement_data[i].type)
{ {
case TYPE_BOOL: case TYPE_BOOL:
replace << m_stmt->statement_data[i].data.boolean ? "1" : "0"; replace << (m_stmt->statement_data[i].data.boolean ? "1" : "0");
break; break;
case TYPE_UI8: case TYPE_UI8:
case TYPE_UI16: case TYPE_UI16:
case TYPE_UI32: case TYPE_UI32:
replace << m_stmt->statement_data[i].data.ui32; replace << m_stmt->statement_data[i].data.ui32;
break; break;
case TYPE_I8: case TYPE_I8:
case TYPE_I16: case TYPE_I16:
case TYPE_I32: case TYPE_I32:
replace << m_stmt->statement_data[i].data.i32; replace << m_stmt->statement_data[i].data.i32;
break; break;
case TYPE_UI64: case TYPE_UI64:
replace << m_stmt->statement_data[i].data.ui64; replace << m_stmt->statement_data[i].data.ui64;
break; break;
case TYPE_I64: case TYPE_I64:
replace << m_stmt->statement_data[i].data.i64; replace << m_stmt->statement_data[i].data.i64;
break; break;
case TYPE_FLOAT: case TYPE_FLOAT:
replace << m_stmt->statement_data[i].data.f; replace << m_stmt->statement_data[i].data.f;
break; break;
case TYPE_DOUBLE: case TYPE_DOUBLE:
replace << m_stmt->statement_data[i].data.d; replace << m_stmt->statement_data[i].data.d;
break; break;
case TYPE_STRING: case TYPE_STRING:
replace << m_stmt->statement_data[i].str; replace << m_stmt->statement_data[i].str;
break; break;
} }
replace << "'"; replace << "'";
queryString.replace(pos, 1, replace.str()); queryString.replace(pos, 1, replace.str());