From 1680d159ecbf75591d2dab1416ff8144c27d4de5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 30 Jul 2014 12:25:16 +0300 Subject: Rename player_node variable into localPlayer. --- src/net/ea/partyhandler.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/net/ea/partyhandler.cpp') diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index 2b83d9eb8..d1e682e43 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -103,12 +103,12 @@ void PartyHandler::processPartyInfo(Net::MessageIn &msg) const if ((*it)->getOnline()) onlineNames.insert((*it)->getName()); } - onlineNames.insert(player_node->getName()); + onlineNames.insert(localPlayer->getName()); } } - if (!player_node) - logger->log1("error: player_node==0 in SMSG_PARTY_INFO"); + if (!localPlayer) + logger->log1("error: localPlayer==0 in SMSG_PARTY_INFO"); if (Ea::taParty) Ea::taParty->clearMembers(); @@ -118,10 +118,10 @@ void PartyHandler::processPartyInfo(Net::MessageIn &msg) const Ea::taParty->setName(msg.readString(24)); const int count = (length - 28) / 46; - if (player_node && Ea::taParty) + if (localPlayer && Ea::taParty) { - player_node->setParty(Ea::taParty); - player_node->setPartyName(Ea::taParty->getName()); + localPlayer->setParty(Ea::taParty); + localPlayer->setPartyName(Ea::taParty->getName()); } for (int i = 0; i < count; i++) @@ -175,10 +175,10 @@ void PartyHandler::processPartyInfo(Net::MessageIn &msg) const if (Ea::taParty) Ea::taParty->sort(); - if (player_node && Ea::taParty) + if (localPlayer && Ea::taParty) { - player_node->setParty(Ea::taParty); - player_node->setPartyName(Ea::taParty->getName()); + localPlayer->setParty(Ea::taParty); + localPlayer->setPartyName(Ea::taParty->getName()); if (socialWindow) socialWindow->updateParty(); } @@ -339,10 +339,10 @@ void PartyHandler::processPartyLeave(Net::MessageIn &msg) const const int id = msg.readInt32(); const std::string nick = msg.readString(24); msg.readUInt8(); // fail - if (!player_node) + if (!localPlayer) return; - if (id == player_node->getId()) + if (id == localPlayer->getId()) { if (Ea::taParty) { @@ -354,7 +354,7 @@ void PartyHandler::processPartyLeave(Net::MessageIn &msg) const if (socialWindow && Ea::taParty) socialWindow->removeTab(Ea::taParty); - player_node->setPartyName(""); + localPlayer->setPartyName(""); } else { -- cgit v1.2.3-70-g09d2