From 9cfdfb10f59935610e8f05189069f4ff37c9721f Mon Sep 17 00:00:00 2001 From: Xfurry Date: Mon, 8 Jan 2018 20:23:33 +0100 Subject: [PATCH] Change and unify 'BattleField' to 'Battlefield' Signed-off-by: Xfurry --- src/game/BattleGround/BattleGroundHandler.cpp | 2 +- src/game/Battlefield/Battlefield.cpp | 4 ++-- src/game/Battlefield/Battlefield.h | 2 +- src/game/Entities/Player.cpp | 8 ++++---- src/game/Groups/Group.h | 4 ++-- src/game/OutdoorPvP/OutdoorPvP.h | 6 +++--- src/game/OutdoorPvP/OutdoorPvPMgr.cpp | 6 +++--- src/game/Server/Opcodes.cpp | 2 +- src/game/Server/WorldSession.h | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/game/BattleGround/BattleGroundHandler.cpp b/src/game/BattleGround/BattleGroundHandler.cpp index 602ae1059b9..3217f9d9772 100644 --- a/src/game/BattleGround/BattleGroundHandler.cpp +++ b/src/game/BattleGround/BattleGroundHandler.cpp @@ -338,7 +338,7 @@ void WorldSession::HandleBattlefieldListOpcode(WorldPacket& recv_data) SendPacket(data); } -void WorldSession::HandleBattleFieldPortOpcode(WorldPacket& recv_data) +void WorldSession::HandleBattlefieldPortOpcode(WorldPacket& recv_data) { DEBUG_LOG("WORLD: Received opcode CMSG_BATTLEFIELD_PORT"); diff --git a/src/game/Battlefield/Battlefield.cpp b/src/game/Battlefield/Battlefield.cpp index c83642c3f44..914219b25b4 100644 --- a/src/game/Battlefield/Battlefield.cpp +++ b/src/game/Battlefield/Battlefield.cpp @@ -29,7 +29,7 @@ Battlefield::Battlefield() : OutdoorPvP(), m_battleFieldId(0) { - m_isBattleField = true; + m_isBattlefield = true; // init generic timers for all battlefields m_battleDuration = sWorld.getConfig(CONFIG_UINT32_BATTLEFIELD_BATTLE_DURATION) * MINUTE * IN_MILLISECONDS; @@ -479,7 +479,7 @@ bool Battlefield::CanAddPlayerToRaid(Player* player) DEBUG_LOG("Battlefield: No free raid for %s!", player->GetGuidStr().c_str()); if (IsTeamFull(teamIdx)) { - DEBUG_LOG("Battlefield: BattleField is full! Can't add player %s!", player->GetGuidStr().c_str()); + DEBUG_LOG("Battlefield: Battlefield is full! Can't add player %s!", player->GetGuidStr().c_str()); return false; } diff --git a/src/game/Battlefield/Battlefield.h b/src/game/Battlefield/Battlefield.h index 5074924cee7..379e9b6deb4 100644 --- a/src/game/Battlefield/Battlefield.h +++ b/src/game/Battlefield/Battlefield.h @@ -24,7 +24,7 @@ #include "Globals/SharedDefines.h" #include "OutdoorPvP/OutdoorPvP.h" -class BattleField; +class Battlefield; class Group; enum BattlefieldStatus diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp index e95fdbd1844..290d3b07bd6 100644 --- a/src/game/Entities/Player.cpp +++ b/src/game/Entities/Player.cpp @@ -4797,7 +4797,7 @@ Corpse* Player::CreateCorpse() if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_CLOAK)) flags |= CORPSE_FLAG_HIDE_CLOAK; OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetCachedZoneId()); - if ((InBattleGround() && !InArena()) || (outdoorPvP && outdoorPvP->IsBattleField() && + if ((InBattleGround() && !InArena()) || (outdoorPvP && outdoorPvP->IsBattlefield() && ((Battlefield*)outdoorPvP)->GetBattlefieldStatus() == BF_STATUS_IN_PROGRESS && ((Battlefield*)outdoorPvP)->HasPlayer(GetObjectGuid()))) flags |= CORPSE_FLAG_LOOTABLE; // to be able to remove insignia corpse->SetUInt32Value(CORPSE_FIELD_FLAGS, flags); @@ -8282,7 +8282,7 @@ bool Player::CheckAmmoCompatibility(const ItemPrototype* ammo_proto) const void Player::RemovedInsignia(Player* looterPlr) { OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(GetCachedZoneId()); - if (!GetBattleGroundId() && (!outdoorPvP || !outdoorPvP->IsBattleField() || + if (!GetBattleGroundId() && (!outdoorPvP || !outdoorPvP->IsBattlefield() || ((Battlefield*)outdoorPvP)->GetBattlefieldStatus() != BF_STATUS_IN_PROGRESS || !((Battlefield*)outdoorPvP)->HasPlayer(GetObjectGuid()))) return; @@ -15701,7 +15701,7 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder* holder) if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(fields[34].GetUInt32())) { - if (outdoorPvP->IsBattleField()) + if (outdoorPvP->IsBattlefield()) ((Battlefield*)outdoorPvP)->HandlePlayerLoggedIn(this); } @@ -21899,7 +21899,7 @@ bool Player::CanStartFlyInArea(uint32 mapid, uint32 zone, uint32 area) const // Disallow mounting in wintergrasp when battle is in progress if (OutdoorPvP* outdoorPvP = sOutdoorPvPMgr.GetScript(zone)) { - if (outdoorPvP->IsBattleField()) + if (outdoorPvP->IsBattlefield()) return ((Battlefield*)outdoorPvP)->GetBattlefieldStatus() != BF_STATUS_IN_PROGRESS; } diff --git a/src/game/Groups/Group.h b/src/game/Groups/Group.h index 6d735d251d7..2b808c91171 100644 --- a/src/game/Groups/Group.h +++ b/src/game/Groups/Group.h @@ -24,7 +24,7 @@ #include "GroupReference.h" #include "GroupRefManager.h" #include "BattleGround/BattleGround.h" -#include "BattleField/Battlefield.h" +#include "Battlefield/Battlefield.h" #include "Server/DBCEnums.h" #include "Globals/SharedDefines.h" @@ -33,7 +33,7 @@ struct ItemPrototype; class WorldSession; class Map; class BattleGround; -class BattleField; +class Battlefield; class DungeonPersistentState; class Field; class Unit; diff --git a/src/game/OutdoorPvP/OutdoorPvP.h b/src/game/OutdoorPvP/OutdoorPvP.h index f9068f83770..32135826cea 100644 --- a/src/game/OutdoorPvP/OutdoorPvP.h +++ b/src/game/OutdoorPvP/OutdoorPvP.h @@ -52,7 +52,7 @@ class OutdoorPvP friend class OutdoorPvPMgr; public: - OutdoorPvP() : m_isBattleField(false) {} + OutdoorPvP() : m_isBattlefield(false) {} virtual ~OutdoorPvP() {} // called when the zone is initialized @@ -100,7 +100,7 @@ class OutdoorPvP void SetBannerVisual(GameObject* go, uint32 artKit, uint32 animId); // check if zone is battlefield - bool IsBattleField() const { return m_isBattleField; } + bool IsBattlefield() const { return m_isBattlefield; } // Handle script condition fulfillment virtual bool IsConditionFulfilled(Player const* /*source*/, uint32 /*conditionId*/, WorldObject const* /*conditionSource*/, uint32 /*conditionSourceType*/) { return false; } @@ -129,7 +129,7 @@ class OutdoorPvP // store the players inside the area GuidZoneMap m_zonePlayers; - bool m_isBattleField; + bool m_isBattlefield; }; #endif diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp index 42d3578123d..971e182c2a9 100644 --- a/src/game/OutdoorPvP/OutdoorPvPMgr.cpp +++ b/src/game/OutdoorPvP/OutdoorPvPMgr.cpp @@ -28,8 +28,8 @@ #include "OutdoorPvPSI.h" #include "OutdoorPvPTF.h" #include "OutdoorPvPZM.h" -#include "BattleField/BattleField.h" -#include "BattleField/BattleFieldWG.h" +#include "Battlefield/Battlefield.h" +#include "Battlefield/BattlefieldWG.h" INSTANTIATE_SINGLETON_1(OutdoorPvPMgr); @@ -187,7 +187,7 @@ Battlefield* OutdoorPvPMgr::GetBattlefieldById(uint32 id) { for (uint8 i = 0; i < MAX_OPVP_ID; ++i) if (OutdoorPvP* script = m_scripts[i]) - if (script->IsBattleField() && ((Battlefield*)script)->GetBattlefieldId() == id) + if (script->IsBattlefield() && ((Battlefield*)script)->GetBattlefieldId() == id) return (Battlefield*)script; return NULL; diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp index ca4a0ba4745..020a39e72e0 100644 --- a/src/game/Server/Opcodes.cpp +++ b/src/game/Server/Opcodes.cpp @@ -751,7 +751,7 @@ OpcodeHandler opcodeTable[NUM_MSG_TYPES] = /*0x2D2*/ { "SMSG_PLAY_SOUND", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, /*0x2D3*/ { "CMSG_BATTLEFIELD_STATUS", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlefieldStatusOpcode }, /*0x2D4*/ { "SMSG_BATTLEFIELD_STATUS", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide }, - /*0x2D5*/ { "CMSG_BATTLEFIELD_PORT", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattleFieldPortOpcode }, + /*0x2D5*/ { "CMSG_BATTLEFIELD_PORT", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlefieldPortOpcode }, /*0x2D6*/ { "MSG_INSPECT_HONOR_STATS", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleInspectHonorStatsOpcode }, /*0x2D7*/ { "CMSG_BATTLEMASTER_HELLO", STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlemasterHelloOpcode }, /*0x2D8*/ { "CMSG_MOVE_START_SWIM_CHEAT", STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_NULL }, diff --git a/src/game/Server/WorldSession.h b/src/game/Server/WorldSession.h index 18266c3ac9f..ac5d6e2dc09 100644 --- a/src/game/Server/WorldSession.h +++ b/src/game/Server/WorldSession.h @@ -786,7 +786,7 @@ class WorldSession void HandleBattleGroundPlayerPositionsOpcode(WorldPacket& recv_data); void HandlePVPLogDataOpcode(WorldPacket& recv_data); void HandleBattlefieldStatusOpcode(WorldPacket& recv_data); - void HandleBattleFieldPortOpcode(WorldPacket& recv_data); + void HandleBattlefieldPortOpcode(WorldPacket& recv_data); void HandleBattlefieldListOpcode(WorldPacket& recv_data); void HandleLeaveBattlefieldOpcode(WorldPacket& recv_data); void HandleBattlemasterJoinArena(WorldPacket& recv_data);