aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSilinoron <silinoron@trinity>2011-08-01 19:34:26 -0700
committerSilinoron <silinoron@trinity>2011-08-01 19:34:26 -0700
commit28d541fed3bec37f899e3639e7935f84dbd60749 (patch)
treeaec1e86c90ab1f1c50b74496769a5a264fdf1081 /src
parent588f5af26ace68b61ae77774eec64307596994aa (diff)
A handful more compilation errors tossed out. The core should now compile as normal.
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Server/Protocol/Handlers/ReferAFriendHandler.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/ReferAFriendHandler.cpp b/src/server/game/Server/Protocol/Handlers/ReferAFriendHandler.cpp
index c615474c3ef..678e7a96d07 100644
--- a/src/server/game/Server/Protocol/Handlers/ReferAFriendHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ReferAFriendHandler.cpp
@@ -17,7 +17,7 @@
#include "WorldSession.h"
#include "Player.h"
-#include "ObjectManager.h"
+#include "ObjectMgr.h"
#include "Opcodes.h"
#include "Log.h"
@@ -37,11 +37,11 @@ void WorldSession::HandleGrantLevel(WorldPacket& recv_data)
error = ERR_REFER_A_FRIEND_NO_TARGET;
else if (levels == 0)
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;
else if (target->GetTeamId() != _player->GetTeamId())
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;
else if (target->getLevel() >= sWorld->getIntConfig(CONFIG_MAX_RECRUIT_A_FRIEND_BONUS_PLAYER_LEVEL))
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;
if (error) {
- WorldPacket data(SMSG_REFER_A_FRIEND_ERROR, 24);
+ WorldPacket data(SMSG_REFER_A_FRIEND_FAILURE, 24);
data << uint32(error);
if (error == ERR_REFER_A_FRIEND_NOT_IN_GROUP)
data << target->GetName();
- GetSession()->SendPacket(&data);
+ SendPacket(&data);
return;
}
- WorldPacket data(SMSG_PROPOSE_LEVEL_GRANT, 8);
- data << _player->GetPackGUID();
- target->GetSession()->SendPacket(&data);
+ WorldPacket data2(SMSG_PROPOSE_LEVEL_GRANT, 8);
+ data2.append(_player->GetPackGUID());
+ target->GetSession()->SendPacket(&data2);
}
void WorldSession::HandleAcceptGrantLevel(WorldPacket& recv_data)
@@ -70,11 +70,11 @@ void WorldSession::HandleAcceptGrantLevel(WorldPacket& recv_data)
uint64 guid;
recv_data.readPackGUID(guid);
- Player *other = sObjectMgr->GetPlayer(guid);
+ Player *other = ObjectAccessor::GetObjectInWorld(guid, _player);
if (!(other && other->GetSession()))
return;
- if (_player->GetSession()->GetAccountId() != other->GetSession()->GetRecruiterId())
+ if (GetAccountId() != other->GetSession()->GetRecruiterId())
return;
if (other->GetGrantableLevels())