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

Warning fixes and some random cleanup here and there

Browse Source
This commit is contained in:
Spp
2012-03-07 14:09:18 +01:00
parent e5d23103f3
commit f495e0efe4
123 changed files with 682 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Guilds/Guild.cpp
+47 -47
View File
@@ -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);
}
}
@@ -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));
@@ -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;
@@ -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;
@@ -1552,8 +1552,8 @@ 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;
@@ -1561,9 +1561,9 @@ void Guild::HandleUpdateMemberRank(WorldSession* session, const std::string& nam
}
// 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());
}
}
@@ -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)
@@ -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());
}
@@ -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;
}
@@ -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;
@@ -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)
{
@@ -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 !!
@@ -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;
@@ -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;
}
@@ -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;
}
@@ -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;
}
src/server/game/Guilds/GuildMgr.cpp
-1
View File
@@ -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");
src/server/game/Handlers/LootHandler.cpp
+2 -2
View File
@@ -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;
src/server/game/Scripting/MapScripts.cpp
+41 -41
View File
@@ -375,22 +375,22 @@ void Map::ScriptsProcess()
}
if (step.script->Talk.Flags & SF_TALK_USE_PLAYER)
{
if (Player* pSource = _GetScriptPlayerSourceOrTarget(source, target, step.script))
if (Player* player = _GetScriptPlayerSourceOrTarget(source, target, step.script))
{
LocaleConstant loc_idx = pSource->GetSession()->GetSessionDbLocaleIndex();
LocaleConstant loc_idx = player->GetSession()->GetSessionDbLocaleIndex();
std::string text(sObjectMgr->GetTrinityString(step.script->Talk.TextID, loc_idx));
switch (step.script->Talk.ChatType)
{
case CHAT_TYPE_SAY:
pSource->Say(text, LANG_UNIVERSAL);
player->Say(text, LANG_UNIVERSAL);
break;
case CHAT_TYPE_YELL:
pSource->Yell(text, LANG_UNIVERSAL);
player->Yell(text, LANG_UNIVERSAL);
break;
case CHAT_TYPE_TEXT_EMOTE:
case CHAT_TYPE_BOSS_EMOTE:
pSource->TextEmote(text);
player->TextEmote(text);
break;
case CHAT_TYPE_WHISPER:
case CHAT_MSG_RAID_BOSS_WHISPER:
@@ -399,7 +399,7 @@ void Map::ScriptsProcess()
if (!targetGUID || !IS_PLAYER_GUID(targetGUID))
sLog->outError("%s attempt to whisper to non-player unit, skipping.", step.script->GetDebugInfo().c_str());
else
pSource->Whisper(text, LANG_UNIVERSAL, targetGUID);
player->Whisper(text, LANG_UNIVERSAL, targetGUID);
break;
}
default:
@@ -524,8 +524,8 @@ void Map::ScriptsProcess()
else
{
// Source or target must be Player.
if (Player* pSource = _GetScriptPlayerSourceOrTarget(source, target, step.script))
pSource->TeleportTo(step.script->TeleportTo.MapID, step.script->TeleportTo.DestX, step.script->TeleportTo.DestY, step.script->TeleportTo.DestZ, step.script->TeleportTo.Orientation);
if (Player* player = _GetScriptPlayerSourceOrTarget(source, target, step.script))
player->TeleportTo(step.script->TeleportTo.MapID, step.script->TeleportTo.DestX, step.script->TeleportTo.DestY, step.script->TeleportTo.DestZ, step.script->TeleportTo.Orientation);
}
break;
@@ -544,8 +544,8 @@ void Map::ScriptsProcess()
// when script called for item spell casting then target == (unit or GO) and source is player
WorldObject* worldObject;
Player* plrTarget = target->ToPlayer();
if (plrTarget)
Player* player = target->ToPlayer();
if (player)
{
if (source->GetTypeId() != TYPEID_UNIT && source->GetTypeId() != TYPEID_GAMEOBJECT && source->GetTypeId() != TYPEID_PLAYER)
{
@@ -557,8 +557,8 @@ void Map::ScriptsProcess()
}
else
{
plrTarget = source->ToPlayer();
if (plrTarget)
player = source->ToPlayer();
if (player)
{
if (target->GetTypeId() != TYPEID_UNIT && target->GetTypeId() != TYPEID_GAMEOBJECT && target->GetTypeId() != TYPEID_PLAYER)
{
@@ -579,22 +579,22 @@ void Map::ScriptsProcess()
// quest id and flags checked at script loading
if ((worldObject->GetTypeId() != TYPEID_UNIT || ((Unit*)worldObject)->isAlive()) &&
(step.script->QuestExplored.Distance == 0 || worldObject->IsWithinDistInMap(plrTarget, float(step.script->QuestExplored.Distance))))
plrTarget->AreaExploredOrEventHappens(step.script->QuestExplored.QuestID);
(step.script->QuestExplored.Distance == 0 || worldObject->IsWithinDistInMap(player, float(step.script->QuestExplored.Distance))))
player->AreaExploredOrEventHappens(step.script->QuestExplored.QuestID);
else
plrTarget->FailQuest(step.script->QuestExplored.QuestID);
player->FailQuest(step.script->QuestExplored.QuestID);
break;
}
case SCRIPT_COMMAND_KILL_CREDIT:
// Source or target must be Player.
if (Player* pSource = _GetScriptPlayerSourceOrTarget(source, target, step.script))
if (Player* player = _GetScriptPlayerSourceOrTarget(source, target, step.script))
{
if (step.script->KillCredit.Flags & SF_KILLCREDIT_REWARD_GROUP)
pSource->RewardPlayerAndGroupAtEvent(step.script->KillCredit.CreatureEntry, pSource);
player->RewardPlayerAndGroupAtEvent(step.script->KillCredit.CreatureEntry, player);
else
pSource->KilledMonsterCredit(step.script->KillCredit.CreatureEntry, 0);
player->KilledMonsterCredit(step.script->KillCredit.CreatureEntry, 0);
}
break;
@@ -665,7 +665,7 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_ACTIVATE_OBJECT:
// Source must be Unit.
if (Unit* pSource = _GetScriptUnit(source, true, step.script))
if (Unit* unit = _GetScriptUnit(source, true, step.script))
{
// Target must be GameObject.
if (!target)
@@ -682,7 +682,7 @@ void Map::ScriptsProcess()
}
if (GameObject* pGO = target->ToGameObject())
pGO->Use(pSource);
pGO->Use(unit);
}
break;
@@ -690,8 +690,8 @@ void Map::ScriptsProcess()
{
// Source (datalong2 != 0) or target (datalong2 == 0) must be Unit.
bool bReverse = step.script->RemoveAura.Flags & SF_REMOVEAURA_REVERSE;
if (Unit* pTarget = _GetScriptUnit(bReverse ? source : target, bReverse, step.script))
pTarget->RemoveAurasDueToSpell(step.script->RemoveAura.SpellID);
if (Unit* unit = _GetScriptUnit(bReverse ? source : target, bReverse, step.script))
unit->RemoveAurasDueToSpell(step.script->RemoveAura.SpellID);
break;
}
@@ -752,23 +752,23 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_PLAY_SOUND:
// Source must be WorldObject.
if (WorldObject* pSource = _GetScriptWorldObject(source, true, step.script))
if (WorldObject* object = _GetScriptWorldObject(source, true, step.script))
{
// PlaySound.Flags bitmask: 0/1=anyone/target
Player* pTarget = NULL;
Player* player = NULL;
if (step.script->PlaySound.Flags & SF_PLAYSOUND_TARGET_PLAYER)
{
// Target must be Player.
pTarget = _GetScriptPlayer(target, false, step.script);
if (!pTarget)
player = _GetScriptPlayer(target, false, step.script);
if (!target)
break;
}
// PlaySound.Flags bitmask: 0/2=without/with distance dependent
if (step.script->PlaySound.Flags & SF_PLAYSOUND_DISTANCE_SOUND)
pSource->PlayDistanceSound(step.script->PlaySound.SoundID, pTarget);
object->PlayDistanceSound(step.script->PlaySound.SoundID, player);
else
pSource->PlayDirectSound(step.script->PlaySound.SoundID, pTarget);
object->PlayDirectSound(step.script->PlaySound.SoundID, player);
}
break;
@@ -796,12 +796,12 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_LOAD_PATH:
// Source must be Unit.
if (Unit* pSource = _GetScriptUnit(source, true, step.script))
if (Unit* unit = _GetScriptUnit(source, true, step.script))
{
if (!sWaypointMgr->GetPath(step.script->LoadPath.PathID))
sLog->outError("%s source object has an invalid path (%u), skipping.", step.script->GetDebugInfo().c_str(), step.script->LoadPath.PathID);
else
pSource->GetMotionMaster()->MovePath(step.script->LoadPath.PathID, step.script->LoadPath.IsRepeatable);
unit->GetMotionMaster()->MovePath(step.script->LoadPath.PathID, step.script->LoadPath.IsRepeatable);
}
break;
@@ -876,21 +876,21 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_ORIENTATION:
// Source must be Unit.
if (Unit* pSource = _GetScriptUnit(source, true, step.script))
if (Unit* sourceUnit = _GetScriptUnit(source, true, step.script))
{
if (step.script->Orientation.Flags& SF_ORIENTATION_FACE_TARGET)
if (step.script->Orientation.Flags & SF_ORIENTATION_FACE_TARGET)
{
// Target must be Unit.
Unit* pTarget = _GetScriptUnit(target, false, step.script);
if (!pTarget)
Unit* targetUnit = _GetScriptUnit(target, false, step.script);
if (!targetUnit)
break;
pSource->SetInFront(pTarget);
sourceUnit->SetInFront(targetUnit);
}
else
pSource->SetOrientation(step.script->Orientation.Orientation);
sourceUnit->SetOrientation(step.script->Orientation.Orientation);
pSource->SendMovementFlagUpdate();
sourceUnit->SendMovementFlagUpdate();
}
break;
@@ -908,14 +908,14 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_CLOSE_GOSSIP:
// Source must be Player.
if (Player* pSource = _GetScriptPlayer(source, true, step.script))
pSource->PlayerTalkClass->SendCloseGossip();
if (Player* player = _GetScriptPlayer(source, true, step.script))
player->PlayerTalkClass->SendCloseGossip();
break;
case SCRIPT_COMMAND_PLAYMOVIE:
// Source must be Player.
if (Player* pSource = _GetScriptPlayer(source, true, step.script))
pSource->SendMovieStart(step.script->PlayMovie.MovieID);
if (Player* player = _GetScriptPlayer(source, true, step.script))
player->SendMovieStart(step.script->PlayMovie.MovieID);
break;
default:
src/server/game/Texts/CreatureTextMgr.h
+2
View File
@@ -158,6 +158,8 @@ class CreatureTextLocalizer
case CHAT_MSG_RAID_BOSS_WHISPER:
data.put<uint64>(whisperGUIDpos, player->GetGUID());
break;
default:
break;
}
player->SendDirectMessage(&data);