Skip to content

Commit

Permalink
Warning fixes and some random cleanup here and there
Browse files Browse the repository at this point in the history
  • Loading branch information
@xurxogr
xurxogr committed Mar 7, 2012
1 parent e5d2310 commit f495e0e
Show file tree
Hide file tree
Showing 123 changed files with 684 additions and 802 deletions.
94 changes: 47 additions & 47 deletions src/server/game/Guilds/Guild.cpp
View file
Expand Up @@ -1349,12 +1349,12 @@ void Guild::HandleSetMemberNote(WorldSession* session, const std::string& name,
if (!_HasRankRight(session->GetPlayer(), officer ? GR_RIGHT_EOFFNOTE : GR_RIGHT_EPNOTE))
SendCommandResult(session, GUILD_INVITE_S, ERR_GUILD_PERMISSIONS);
// Noted player must be a member of guild
else if (Member* pMember = GetMember(session, name))
else if (Member* member = GetMember(session, name))
{
if (officer)
pMember->SetOfficerNote(note);
member->SetOfficerNote(note);
else
pMember->SetPublicNote(note);
member->SetPublicNote(note);
HandleRoster(session);
}
}
Expand Down Expand Up @@ -1499,17 +1499,17 @@ void Guild::HandleRemoveMember(WorldSession* session, const std::string& name)
if (!_HasRankRight(player, GR_RIGHT_REMOVE))
SendCommandResult(session, GUILD_INVITE_S, ERR_GUILD_PERMISSIONS);
// Removed player must be a member of guild
else if (Member* pMember = GetMember(session, name))
else if (Member* member = GetMember(session, name))
{
// Leader cannot be removed
if (pMember->IsRank(GR_GUILDMASTER))
if (member->IsRank(GR_GUILDMASTER))
SendCommandResult(session, GUILD_QUIT_S, ERR_GUILD_LEADER_LEAVE);
// Do not allow to remove player with the same rank or higher
else if (pMember->IsRankNotLower(player->GetRank()))
else if (member->IsRankNotLower(player->GetRank()))
SendCommandResult(session, GUILD_QUIT_S, ERR_GUILD_RANK_TOO_HIGH_S, name);
else
{
uint64 guid = pMember->GetGUID();
uint64 guid = member->GetGUID();
// After call to DeleteMember pointer to member becomes invalid
DeleteMember(guid, false, true);
_LogEvent(GUILD_EVENT_LOG_UNINVITE_PLAYER, player->GetGUIDLow(), GUID_LOPART(guid));
Expand All @@ -1525,10 +1525,10 @@ void Guild::HandleUpdateMemberRank(WorldSession* session, const std::string& nam
if (!_HasRankRight(player, demote ? GR_RIGHT_DEMOTE : GR_RIGHT_PROMOTE))
SendCommandResult(session, GUILD_INVITE_S, ERR_GUILD_PERMISSIONS);
// Promoted player must be a member of guild
else if (Member* pMember = GetMember(session, name))
else if (Member* member = GetMember(session, name))
{
// Player cannot promote himself
if (pMember->IsSamePlayer(player->GetGUID()))
if (member->IsSamePlayer(player->GetGUID()))
{
SendCommandResult(session, GUILD_INVITE_S, ERR_GUILD_NAME_INVALID);
return;
Expand All @@ -1537,13 +1537,13 @@ void Guild::HandleUpdateMemberRank(WorldSession* session, const std::string& nam
if (demote)
{
// Player can demote only lower rank members
if (pMember->IsRankNotLower(player->GetRank()))
if (member->IsRankNotLower(player->GetRank()))
{
SendCommandResult(session, GUILD_INVITE_S, ERR_GUILD_RANK_TOO_HIGH_S, name);
return;
}
// Lowest rank cannot be demoted
if (pMember->GetRankId() >= _GetLowestRankId())
if (member->GetRankId() >= _GetLowestRankId())
{
SendCommandResult(session, GUILD_INVITE_S, ERR_GUILD_RANK_TOO_LOW_S, name);
return;
Expand All @@ -1552,18 +1552,18 @@ void Guild::HandleUpdateMemberRank(WorldSession* session, const std::string& nam
else
{
// Allow to promote only to lower rank than member's rank
// pMember->GetRank() + 1 is the highest rank that current player can promote to
if (pMember->IsRankNotLower(player->GetRank() + 1))
// member->GetRank() + 1 is the highest rank that current player can promote to
if (member->IsRankNotLower(player->GetRank() + 1))
{
SendCommandResult(session, GUILD_INVITE_S, ERR_GUILD_RANK_TOO_HIGH_S, name);
return;
}
}

// When promoting player, rank is decreased, when demoting - increased
uint32 newRankId = pMember->GetRankId() + (demote ? 1 : -1);
pMember->ChangeRank(newRankId);
_LogEvent(demote ? GUILD_EVENT_LOG_DEMOTE_PLAYER : GUILD_EVENT_LOG_PROMOTE_PLAYER, player->GetGUIDLow(), GUID_LOPART(pMember->GetGUID()), newRankId);
uint32 newRankId = member->GetRankId() + (demote ? 1 : -1);
member->ChangeRank(newRankId);
_LogEvent(demote ? GUILD_EVENT_LOG_DEMOTE_PLAYER : GUILD_EVENT_LOG_PROMOTE_PLAYER, player->GetGUIDLow(), GUID_LOPART(member->GetGUID()), newRankId);
_BroadcastEvent(demote ? GE_DEMOTION : GE_PROMOTION, 0, player->GetName(), name.c_str(), _GetRankName(newRankId).c_str());
}
}
Expand Down Expand Up @@ -1672,8 +1672,8 @@ bool Guild::HandleMemberWithdrawMoney(WorldSession* session, uint32 amount, bool
SQLTransaction trans = CharacterDatabase.BeginTransaction();
// Update remaining money amount
if (remainingMoney < uint32(GUILD_WITHDRAW_MONEY_UNLIMITED))
if (Member* pMember = GetMember(player->GetGUID()))
pMember->DecreaseBankRemainingValue(trans, GUILD_BANK_MAX_TABS, amount);
if (Member* member = GetMember(player->GetGUID()))
member->DecreaseBankRemainingValue(trans, GUILD_BANK_MAX_TABS, amount);
// Remove money from bank
_ModifyBankMoney(trans, amount, false);
// Add money to player (if required)
Expand All @@ -1699,10 +1699,10 @@ bool Guild::HandleMemberWithdrawMoney(WorldSession* session, uint32 amount, bool
void Guild::HandleMemberLogout(WorldSession* session)
{
Player* player = session->GetPlayer();
if (Member* pMember = GetMember(player->GetGUID()))
if (Member* member = GetMember(player->GetGUID()))
{
pMember->SetStats(player);
pMember->UpdateLogoutTime();
member->SetStats(player);
member->UpdateLogoutTime();
}
_BroadcastEvent(GE_SIGNED_OFF, player->GetGUID(), player->GetName());
}
Expand Down Expand Up @@ -1868,14 +1868,14 @@ void Guild::LoadRankFromDB(Field* fields)
bool Guild::LoadMemberFromDB(Field* fields)
{
uint32 lowguid = fields[1].GetUInt32();
Member *pMember = new Member(m_id, MAKE_NEW_GUID(lowguid, 0, HIGHGUID_PLAYER), fields[2].GetUInt8());
if (!pMember->LoadFromDB(fields))
Member *member = new Member(m_id, MAKE_NEW_GUID(lowguid, 0, HIGHGUID_PLAYER), fields[2].GetUInt8());
if (!member->LoadFromDB(fields))
{
_DeleteMemberFromDB(lowguid);
delete pMember;
delete member;
return false;
}
m_members[lowguid] = pMember;
m_members[lowguid] = member;
return true;
}

Expand Down Expand Up @@ -2087,9 +2087,9 @@ bool Guild::AddMember(uint64 guid, uint8 rankId)
if (rankId == GUILD_RANK_NONE)
rankId = _GetLowestRankId();

Member* pMember = new Member(m_id, guid, rankId);
Member* member = new Member(m_id, guid, rankId);
if (player)
pMember->SetStats(player);
member->SetStats(player);
else
{
bool ok = false;
Expand All @@ -2099,25 +2099,25 @@ bool Guild::AddMember(uint64 guid, uint8 rankId)
if (PreparedQueryResult result = CharacterDatabase.Query(stmt))
{
Field* fields = result->Fetch();
pMember->SetStats(
member->SetStats(
fields[0].GetString(),
fields[1].GetUInt8(),
fields[2].GetUInt8(),
fields[3].GetUInt16(),
fields[4].GetUInt32());

ok = pMember->CheckStats();
ok = member->CheckStats();
}
if (!ok)
{
delete pMember;
delete member;
return false;
}
}
m_members[lowguid] = pMember;
m_members[lowguid] = member;

SQLTransaction trans(NULL);
pMember->SaveToDB(trans);
member->SaveToDB(trans);
// If player not in game data in will be loaded from guild tables, so no need to update it!
if (player)
{
Expand Down Expand Up @@ -2174,8 +2174,8 @@ void Guild::DeleteMember(uint64 guid, bool isDisbanding, bool isKicked)
// Call script on remove before member is acutally removed from guild (and database)
sScriptMgr->OnGuildRemoveMember(this, player, isDisbanding, isKicked);

if (Member* pMember = GetMember(guid))
delete pMember;
if (Member* member = GetMember(guid))
delete member;
m_members.erase(lowguid);

// If player not online data in data field will be loaded from guild tabs no need to update it !!
Expand All @@ -2193,9 +2193,9 @@ void Guild::DeleteMember(uint64 guid, bool isDisbanding, bool isKicked)
bool Guild::ChangeMemberRank(uint64 guid, uint8 newRank)
{
if (newRank <= _GetLowestRankId()) // Validate rank (allow only existing ranks)
if (Member* pMember = GetMember(guid))
if (Member* member = GetMember(guid))
{
pMember->ChangeRank(newRank);
member->ChangeRank(newRank);
return true;
}
return false;
Expand Down Expand Up @@ -2338,8 +2338,8 @@ bool Guild::_IsLeader(Player* player) const
{
if (player->GetGUID() == m_leaderGuid)
return true;
if (const Member* pMember = GetMember(player->GetGUID()))
return pMember->IsRank(GR_GUILDMASTER);
if (const Member* member = GetMember(player->GetGUID()))
return member->IsRank(GR_GUILDMASTER);
return false;
}

Expand Down Expand Up @@ -2452,15 +2452,15 @@ inline uint8 Guild::_GetRankBankTabRights(uint8 rankId, uint8 tabId) const

inline uint32 Guild::_GetMemberRemainingSlots(uint64 guid, uint8 tabId) const
{
if (const Member* pMember = GetMember(guid))
return pMember->GetBankRemainingValue(tabId, this);
if (const Member* member = GetMember(guid))
return member->GetBankRemainingValue(tabId, this);
return 0;
}

inline uint32 Guild::_GetMemberRemainingMoney(uint64 guid) const
{
if (const Member* pMember = GetMember(guid))
return pMember->GetBankRemainingValue(GUILD_BANK_MAX_TABS, this);
if (const Member* member = GetMember(guid))
return member->GetBankRemainingValue(GUILD_BANK_MAX_TABS, this);
return 0;
}

Expand All @@ -2470,18 +2470,18 @@ inline void Guild::_DecreaseMemberRemainingSlots(SQLTransaction& trans, uint64 g
if (uint32 remainingSlots = _GetMemberRemainingSlots(guid, tabId))
// Ignore guild master
if (remainingSlots < uint32(GUILD_WITHDRAW_SLOT_UNLIMITED))
if (Member* pMember = GetMember(guid))
pMember->DecreaseBankRemainingValue(trans, tabId, 1);
if (Member* member = GetMember(guid))
member->DecreaseBankRemainingValue(trans, tabId, 1);
}

inline bool Guild::_MemberHasTabRights(uint64 guid, uint8 tabId, uint32 rights) const
{
if (const Member* pMember = GetMember(guid))
if (const Member* member = GetMember(guid))
{
// Leader always has full rights
if (pMember->IsRank(GR_GUILDMASTER) || m_leaderGuid == guid)
if (member->IsRank(GR_GUILDMASTER) || m_leaderGuid == guid)
return true;
return (_GetRankBankTabRights(pMember->GetRankId(), tabId) & rights) == rights;
return (_GetRankBankTabRights(member->GetRankId(), tabId) & rights) == rights;
}
return false;
}
Expand Down
1 change: 0 additions & 1 deletion src/server/game/Guilds/GuildMgr.cpp
View file
Expand Up @@ -221,7 +221,6 @@ void GuildMgr::LoadGuilds()
// Delete orphaned guild bank right entries before loading the valid ones
CharacterDatabase.DirectExecute("DELETE gbr FROM guild_bank_right gbr LEFT JOIN guild g ON gbr.guildId = g.guildId WHERE g.guildId IS NULL");


// 0 1 2 3 4
QueryResult result = CharacterDatabase.Query("SELECT guildid, TabId, rid, gbright, SlotPerDay FROM guild_bank_right ORDER BY guildid ASC, TabId ASC");

Expand Down
4 changes: 2 additions & 2 deletions src/server/game/Handlers/LootHandler.cpp
View file
Expand Up @@ -80,9 +80,9 @@ void WorldSession::HandleAutostoreLootItemOpcode(WorldPacket & recv_data)
{
Creature* creature = GetPlayer()->GetMap()->GetCreature(lguid);

bool ok_loot = creature && creature->isAlive() == (player->getClass() == CLASS_ROGUE && creature->lootForPickPocketed);
bool lootAllowed = creature && creature->isAlive() == (player->getClass() == CLASS_ROGUE && creature->lootForPickPocketed);

if (!ok_loot || !creature->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
if (!lootAllowed || !creature->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
{
player->SendLootRelease(lguid);
return;
Expand Down

0 comments on commit f495e0e

Please sign in to comment.