From a75c0cea944720f6b974a350a9716946f49b23d6 Mon Sep 17 00:00:00 2001 From: Antz Date: Mon, 10 Feb 2020 11:24:26 +0000 Subject: [PATCH] Sync core function/variable names to match other cores: BG/BGArenas --- src/game/Object/Object.h | 2 +- src/game/WorldHandlers/Map.cpp | 6 +++--- src/game/WorldHandlers/World.cpp | 18 +++++++++--------- src/game/WorldHandlers/World.h | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/game/Object/Object.h b/src/game/Object/Object.h index c527169b..5cefd3c7 100644 --- a/src/game/Object/Object.h +++ b/src/game/Object/Object.h @@ -41,7 +41,7 @@ #define MAX_VISIBILITY_DISTANCE 333.0f // max distance for visible object show, limited in 333 yards #define DEFAULT_VISIBILITY_DISTANCE 90.0f // default visible distance, 90 yards on continents #define DEFAULT_VISIBILITY_INSTANCE 120.0f // default visible distance in instances, 120 yards -#define DEFAULT_VISIBILITY_BG 180.0f // default visible distance in BG, 180 yards +#define DEFAULT_VISIBILITY_BGARENAS 180.0f // default visible distance in BG/Arenas, 180 yards #define DEFAULT_WORLD_OBJECT_SIZE 0.388999998569489f // currently used (correctly?) for any non Unit world objects. This is actually the bounding_radius, like player/creature from creature_model_data #define DEFAULT_OBJECT_SCALE 1.0f // non-Tauren player/item scale as default, npc/go from database, pets from dbc diff --git a/src/game/WorldHandlers/Map.cpp b/src/game/WorldHandlers/Map.cpp index 547170fd..faa446ef 100644 --- a/src/game/WorldHandlers/Map.cpp +++ b/src/game/WorldHandlers/Map.cpp @@ -1770,7 +1770,7 @@ DungeonPersistentState* DungeonMap::GetPersistanceState() const BattleGroundMap::BattleGroundMap(uint32 id, time_t expiry, uint32 InstanceId) : Map(id, expiry, InstanceId) { - // lets initialize visibility distance for BG + // lets initialize visibility distance for BG/Arenas BattleGroundMap::InitVisibilityDistance(); } @@ -1793,8 +1793,8 @@ BattleGroundPersistentState* BattleGroundMap::GetPersistanceState() const void BattleGroundMap::InitVisibilityDistance() { - // init visibility distance for BG - m_VisibleDistance = World::GetMaxVisibleDistanceInBG(); + // init visibility distance for BG/Arenas + m_VisibleDistance = World::GetMaxVisibleDistanceInBGArenas(); } bool BattleGroundMap::CanEnter(Player* player) diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp index 1f5ae43f..fd9516ae 100644 --- a/src/game/WorldHandlers/World.cpp +++ b/src/game/WorldHandlers/World.cpp @@ -101,7 +101,7 @@ ACE_Atomic_Op World::m_worldLoopCounter = 0; float World::m_MaxVisibleDistanceOnContinents = DEFAULT_VISIBILITY_DISTANCE; float World::m_MaxVisibleDistanceInInstances = DEFAULT_VISIBILITY_INSTANCE; -float World::m_MaxVisibleDistanceInBG = DEFAULT_VISIBILITY_BG; +float World::m_MaxVisibleDistanceInBGArenas = DEFAULT_VISIBILITY_BGARENAS; float World::m_MaxVisibleDistanceInFlight = DEFAULT_VISIBILITY_DISTANCE; float World::m_VisibleUnitGreyDistance = 0; @@ -856,17 +856,17 @@ void World::LoadConfigSettings(bool reload) m_MaxVisibleDistanceInInstances = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance; } - // visibility in BG - m_MaxVisibleDistanceInBG = sConfig.GetFloatDefault("Visibility.Distance.BG", DEFAULT_VISIBILITY_BG); - if (m_MaxVisibleDistanceInBG < 45 * sWorld.getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO)) + // visibility in BG/Arenas + m_MaxVisibleDistanceInBGArenas = sConfig.GetFloatDefault("Visibility.Distance.BGArenas", DEFAULT_VISIBILITY_BGARENAS); + if (m_MaxVisibleDistanceInBGArenas < 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO)) { - sLog.outError("Visibility.Distance.BG can't be less max aggro radius %f", 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO)); - m_MaxVisibleDistanceInBG = 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO); + sLog.outError("Visibility.Distance.BGArenas can't be less max aggro radius %f", 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO)); + m_MaxVisibleDistanceInBGArenas = 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO); } - else if (m_MaxVisibleDistanceInBG + m_VisibleUnitGreyDistance > MAX_VISIBILITY_DISTANCE) + else if (m_MaxVisibleDistanceInBGArenas + m_VisibleUnitGreyDistance > MAX_VISIBILITY_DISTANCE) { - sLog.outError("Visibility.Distance.BG can't be greater %f", MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance); - m_MaxVisibleDistanceInBG = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance; + sLog.outError("Visibility.Distance.BGArenas can't be greater %f", MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance); + m_MaxVisibleDistanceInBGArenas = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance; } m_MaxVisibleDistanceInFlight = sConfig.GetFloatDefault("Visibility.Distance.InFlight", DEFAULT_VISIBILITY_DISTANCE); diff --git a/src/game/WorldHandlers/World.h b/src/game/WorldHandlers/World.h index 8a5c1e9d..2417f23c 100644 --- a/src/game/WorldHandlers/World.h +++ b/src/game/WorldHandlers/World.h @@ -581,7 +581,7 @@ class World // for max speed access static float GetMaxVisibleDistanceOnContinents() { return m_MaxVisibleDistanceOnContinents; } static float GetMaxVisibleDistanceInInstances() { return m_MaxVisibleDistanceInInstances; } - static float GetMaxVisibleDistanceInBG() { return m_MaxVisibleDistanceInBG; } + static float GetMaxVisibleDistanceInBGArenas() { return m_MaxVisibleDistanceInBGArenas; } static float GetMaxVisibleDistanceInFlight() { return m_MaxVisibleDistanceInFlight; } static float GetVisibleUnitGreyDistance() { return m_VisibleUnitGreyDistance; } @@ -688,7 +688,7 @@ class World // for max speed access static float m_MaxVisibleDistanceOnContinents; static float m_MaxVisibleDistanceInInstances; - static float m_MaxVisibleDistanceInBG; + static float m_MaxVisibleDistanceInBGArenas; static float m_MaxVisibleDistanceInFlight; static float m_VisibleUnitGreyDistance;