diff options
Diffstat (limited to 'src/server/game/Handlers/PetitionsHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/PetitionsHandler.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp index 52b15508835..b73e581ad04 100644 --- a/src/server/game/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Handlers/PetitionsHandler.cpp @@ -210,8 +210,8 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket& recvData) if (Petition const* petition = sPetitionMgr->GetPetitionByOwnerWithType(_player->GetGUID(), type)) { // clear from petition store - sPetitionMgr->RemovePetition(petition->petitionGuid); - TC_LOG_DEBUG("network", "Invalid petition GUID: %u", petition->petitionGuid.GetCounter()); + sPetitionMgr->RemovePetition(petition->PetitionGuid); + TC_LOG_DEBUG("network", "Invalid petition GUID: %u", petition->PetitionGuid.GetCounter()); } // fill petition store @@ -233,7 +233,7 @@ void WorldSession::HandlePetitionShowSignOpcode(WorldPacket& recvData) } // if guild petition and has guild => error, return; - if (petition->petitionType == GUILD_CHARTER_TYPE && _player->GetGuildId()) + if (petition->PetitionType == GUILD_CHARTER_TYPE && _player->GetGuildId()) return; TC_LOG_DEBUG("network", "CMSG_PETITION_SHOW_SIGNATURES petition entry: '%u'", petitionGuid.GetCounter()); @@ -243,11 +243,11 @@ void WorldSession::HandlePetitionShowSignOpcode(WorldPacket& recvData) void WorldSession::SendPetitionSigns(Petition const* petition, Player* sendTo) { - SignaturesVector const& signatures = petition->signatures; + SignaturesVector const& signatures = petition->Signatures; WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8 + 8 + 4 + 1 + signatures.size() * 12)); - data << uint64(petition->petitionGuid); // petition guid - data << uint64(petition->ownerGuid); // owner guid - data << uint32(petition->petitionGuid.GetCounter()); // guild guid + data << uint64(petition->PetitionGuid); // petition guid + data << uint64(petition->OwnerGuid); // owner guid + data << uint32(petition->PetitionGuid.GetCounter()); // guild guid data << uint8(signatures.size()); // sign's count for (Signature const& signature : signatures) @@ -281,13 +281,13 @@ void WorldSession::SendPetitionQueryOpcode(ObjectGuid petitionguid) return; } - WorldPacket data(SMSG_PETITION_QUERY_RESPONSE, (4+8+petition->petitionName.size()+1+1+4*12+2+10)); + WorldPacket data(SMSG_PETITION_QUERY_RESPONSE, (4+8+petition->PetitionName.size()+1+1+4*12+2+10)); data << uint32(petitionguid.GetCounter()); // guild/team guid (in Trinity always same as GUID_LOPART(petition guid) - data << uint64(petition->ownerGuid); // charter owner guid - data << petition->petitionName; // name (guild/arena team) + data << uint64(petition->OwnerGuid); // charter owner guid + data << petition->PetitionName; // name (guild/arena team) data << uint8(0); // some string - CharterTypes type = petition->petitionType; + CharterTypes type = petition->PetitionType; if (type == GUILD_CHARTER_TYPE) { uint32 needed = sWorld->getIntConfig(CONFIG_MIN_PETITION_SIGNS); @@ -341,7 +341,7 @@ void WorldSession::HandlePetitionRenameOpcode(WorldPacket& recvData) return; } - CharterTypes type = petition->petitionType; + CharterTypes type = petition->PetitionType; if (type == GUILD_CHARTER_TYPE) { if (sGuildMgr->GetGuildByName(newName)) @@ -397,9 +397,9 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) return; } - ObjectGuid ownerGuid = petition->ownerGuid; - CharterTypes type = petition->petitionType; - uint8 signs = petition->signatures.size(); + ObjectGuid ownerGuid = petition->OwnerGuid; + CharterTypes type = petition->PetitionType; + uint8 signs = petition->Signatures.size(); ObjectGuid playerGuid = _player->GetGUID(); if (ownerGuid == playerGuid) @@ -476,7 +476,7 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) } // fill petition store - petition->AddSignature(petitionGuid, GetAccountId(), playerGuid, false); + petition->AddSignature(GetAccountId(), playerGuid, false); TC_LOG_DEBUG("network", "PETITION SIGN: %s by player: %s (GUID: %u Account: %u)", petitionGuid.ToString().c_str(), _player->GetName().c_str(), playerGuid.GetCounter(), GetAccountId()); @@ -504,7 +504,7 @@ void WorldSession::HandlePetitionDeclineOpcode(WorldPacket& recvData) return; // petition owner online - if (Player* owner = ObjectAccessor::FindConnectedPlayer(petition->ownerGuid)) + if (Player* owner = ObjectAccessor::FindConnectedPlayer(petition->OwnerGuid)) { WorldPacket data(MSG_PETITION_DECLINE, 8); data << uint64(_player->GetGUID()); @@ -530,7 +530,7 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket& recvData) if (!petition) return; - CharterTypes type = petition->petitionType; + CharterTypes type = petition->PetitionType; TC_LOG_DEBUG("network", "OFFER PETITION: type %u, %s, to %s", static_cast<uint32>(type), petitionGuid.ToString().c_str(), offererGuid.ToString().c_str()); @@ -611,11 +611,11 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket& recvData) return; } - CharterTypes type = petition->petitionType; - std::string const name = petition->petitionName; // we need a copy, it will be removed on guild/arena remove + CharterTypes type = petition->PetitionType; + std::string const name = petition->PetitionName; // we need a copy, it will be removed on guild/arena remove // Only the petition owner can turn in the petition - if (_player->GetGUID() != petition->ownerGuid) + if (_player->GetGUID() != petition->OwnerGuid) return; // Petition type (guild/arena) specific checks @@ -659,7 +659,7 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket& recvData) } } - SignaturesVector const signatures = petition->signatures; // we need a copy, it will be removed on guild/arena remove + SignaturesVector const signatures = petition->Signatures; // we need a copy, it will be removed on guild/arena remove uint32 requiredSignatures = static_cast<uint32>(type) - 1; if (type == GUILD_CHARTER_TYPE) requiredSignatures = sWorld->getIntConfig(CONFIG_MIN_PETITION_SIGNS); |