aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-12-13 16:58:59 +0100
committerMachiavelli <none@none>2010-12-13 16:58:59 +0100
commitd75eaf8e83532fa6e0edb95bd69eb88e70bd7c1e (patch)
treed30ee9f195138a80b4a9139bfdfde85598a3fb4d
parent1a4fe4baca17bc10d480e29f6f40891b3ea1189d (diff)
Core/Guild: More signed/unsigned comparison fixes. Should fix guild log loading.
--HG-- branch : trunk
-rwxr-xr-xsrc/server/game/Guilds/Guild.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp
index 8c23b3bcb84..189cb66c438 100755
--- a/src/server/game/Guilds/Guild.cpp
+++ b/src/server/game/Guilds/Guild.cpp
@@ -73,7 +73,7 @@ Guild::LogHolder::~LogHolder()
// Adds event loaded from database to collection
inline void Guild::LogHolder::LoadEvent(LogEntry* entry)
{
- if (m_nextGUID == GUILD_EVENT_LOG_GUID_UNDEFINED)
+ if (m_nextGUID == uint32(GUILD_EVENT_LOG_GUID_UNDEFINED))
m_nextGUID = entry->GetGUID();
m_log.push_front(entry);
}
@@ -107,7 +107,7 @@ inline uint32 Guild::LogHolder::GetNextGUID()
{
// Next guid was not initialized. It means there are no records for this holder in DB yet.
// Start from the beginning.
- if (m_nextGUID == GUILD_EVENT_LOG_GUID_UNDEFINED)
+ if (m_nextGUID == uint32(GUILD_EVENT_LOG_GUID_UNDEFINED))
m_nextGUID = 0;
else
m_nextGUID = (m_nextGUID + 1) % m_maxRecords;
@@ -1669,7 +1669,7 @@ bool Guild::HandleMemberWithdrawMoney(WorldSession* session, uint32 amount, bool
SQLTransaction trans = CharacterDatabase.BeginTransaction();
// Update remaining money amount
- if (remainingMoney < GUILD_WITHDRAW_MONEY_UNLIMITED)
+ if (remainingMoney < uint32(GUILD_WITHDRAW_MONEY_UNLIMITED))
if (Member* pMember = GetMember(player->GetGUID()))
pMember->DecreaseBankRemainingValue(trans, GUILD_BANK_MAX_TABS, amount);
// Remove money from bank