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

A handful more compilation errors tossed out. The core should now compile as normal.

Browse Source
This commit is contained in:
Silinoron
2011-08-01 19:34:26 -07:00
parent 588f5af26a
commit 28d541fed3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Server/Protocol/Handlers/ReferAFriendHandler.cpp
+10 -10
View File
@@ -17,7 +17,7 @@
#include "WorldSession.h" #include "WorldSession.h"
#include "Player.h" #include "Player.h"
#include "ObjectManager.h" #include "ObjectMgr.h"
#include "Opcodes.h" #include "Opcodes.h"
#include "Log.h" #include "Log.h"
@@ -37,11 +37,11 @@ void WorldSession::HandleGrantLevel(WorldPacket& recv_data)
error = ERR_REFER_A_FRIEND_NO_TARGET; error = ERR_REFER_A_FRIEND_NO_TARGET;
else if (levels == 0) else if (levels == 0)
error = ERR_REFER_A_FRIEND_INSUFFICIENT_GRANTABLE_LEVELS; error = ERR_REFER_A_FRIEND_INSUFFICIENT_GRANTABLE_LEVELS;
else if (GetSession()->GetRecruiterId() != target->GetSession()->GetAccountId()) else if (GetRecruiterId() != target->GetSession()->GetAccountId())
error = ERR_REFER_A_FRIEND_NOT_REFERRED_BY; error = ERR_REFER_A_FRIEND_NOT_REFERRED_BY;
else if (target->GetTeamId() != _player->GetTeamId()) else if (target->GetTeamId() != _player->GetTeamId())
error = ERR_REFER_A_FRIEND_DIFFERENT_FACTION; error = ERR_REFER_A_FRIEND_DIFFERENT_FACTION;
else if (target->getLevel() >= _player->GetLevel()) else if (target->getLevel() >= _player->getLevel())
error = ERR_REFER_A_FRIEND_TARGET_TOO_HIGH; error = ERR_REFER_A_FRIEND_TARGET_TOO_HIGH;
else if (target->getLevel() >= sWorld->getIntConfig(CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL)) else if (target->getLevel() >= sWorld->getIntConfig(CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL))
error = ERR_REFER_A_FRIEND_GRANT_LEVEL_MAX_I; error = ERR_REFER_A_FRIEND_GRANT_LEVEL_MAX_I;
@@ -49,18 +49,18 @@ void WorldSession::HandleGrantLevel(WorldPacket& recv_data)
error = ERR_REFER_A_FRIEND_NOT_IN_GROUP; error = ERR_REFER_A_FRIEND_NOT_IN_GROUP;
if (error) { if (error) {
WorldPacket data(SMSG_REFER_A_FRIEND_ERROR, 24); WorldPacket data(SMSG_REFER_A_FRIEND_FAILURE, 24);
data << uint32(error); data << uint32(error);
if (error == ERR_REFER_A_FRIEND_NOT_IN_GROUP) if (error == ERR_REFER_A_FRIEND_NOT_IN_GROUP)
data << target->GetName(); data << target->GetName();
GetSession()->SendPacket(&data); SendPacket(&data);
return; return;
} }
WorldPacket data(SMSG_PROPOSE_LEVEL_GRANT, 8); WorldPacket data2(SMSG_PROPOSE_LEVEL_GRANT, 8);
data << _player->GetPackGUID(); data2.append(_player->GetPackGUID());
target->GetSession()->SendPacket(&data); target->GetSession()->SendPacket(&data2);
} }
void WorldSession::HandleAcceptGrantLevel(WorldPacket& recv_data) void WorldSession::HandleAcceptGrantLevel(WorldPacket& recv_data)
@@ -70,11 +70,11 @@ void WorldSession::HandleAcceptGrantLevel(WorldPacket& recv_data)
uint64 guid; uint64 guid;
recv_data.readPackGUID(guid); recv_data.readPackGUID(guid);
Player *other = sObjectMgr->GetPlayer(guid); Player *other = ObjectAccessor::GetObjectInWorld(guid, _player);
if (!(other && other->GetSession())) if (!(other && other->GetSession()))
return; return;
if (_player->GetSession()->GetAccountId() != other->GetSession()->GetRecruiterId()) if (GetAccountId() != other->GetSession()->GetRecruiterId())
return; return;
if (other->GetGrantableLevels()) if (other->GetGrantableLevels())