server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync core function/variable names to match other cores: BG/BGArenas

Browse Source
This commit is contained in:
Antz 2020-02-10 11:24:26 +00:00
parent 7919108c5a
commit a75c0cea94
No known key found for this signature in database
GPG Key ID: 0DF907270598C85F
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/Object/Object.h
View File

@ -41,7 +41,7 @@
#define MAX_VISIBILITY_DISTANCE 333.0f // max distance for visible object show, limited in 333 yards #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_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_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_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 #define DEFAULT_OBJECT_SCALE 1.0f // non-Tauren player/item scale as default, npc/go from database, pets from dbc

6
src/game/WorldHandlers/Map.cpp
View File

@ -1770,7 +1770,7 @@ DungeonPersistentState* DungeonMap::GetPersistanceState() const
BattleGroundMap::BattleGroundMap(uint32 id, time_t expiry, uint32 InstanceId) BattleGroundMap::BattleGroundMap(uint32 id, time_t expiry, uint32 InstanceId)
: Map(id, expiry, InstanceId) : Map(id, expiry, InstanceId)
{ {
// lets initialize visibility distance for BG // lets initialize visibility distance for BG/Arenas
BattleGroundMap::InitVisibilityDistance(); BattleGroundMap::InitVisibilityDistance();
} }
@ -1793,8 +1793,8 @@ BattleGroundPersistentState* BattleGroundMap::GetPersistanceState() const
void BattleGroundMap::InitVisibilityDistance() void BattleGroundMap::InitVisibilityDistance()
{ {
// init visibility distance for BG // init visibility distance for BG/Arenas
m_VisibleDistance = World::GetMaxVisibleDistanceInBG(); m_VisibleDistance = World::GetMaxVisibleDistanceInBGArenas();
} }
bool BattleGroundMap::CanEnter(Player* player) bool BattleGroundMap::CanEnter(Player* player)

18
src/game/WorldHandlers/World.cpp
View File

@ -101,7 +101,7 @@ ACE_Atomic_Op<ACE_Thread_Mutex, uint32> World::m_worldLoopCounter = 0;
float World::m_MaxVisibleDistanceOnContinents = DEFAULT_VISIBILITY_DISTANCE; float World::m_MaxVisibleDistanceOnContinents = DEFAULT_VISIBILITY_DISTANCE;
float World::m_MaxVisibleDistanceInInstances = DEFAULT_VISIBILITY_INSTANCE; 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_MaxVisibleDistanceInFlight = DEFAULT_VISIBILITY_DISTANCE;
float World::m_VisibleUnitGreyDistance = 0; float World::m_VisibleUnitGreyDistance = 0;
@ -856,17 +856,17 @@ void World::LoadConfigSettings(bool reload)
m_MaxVisibleDistanceInInstances = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance; m_MaxVisibleDistanceInInstances = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance;
} }
// visibility in BG // visibility in BG/Arenas
m_MaxVisibleDistanceInBG = sConfig.GetFloatDefault("Visibility.Distance.BG", DEFAULT_VISIBILITY_BG); m_MaxVisibleDistanceInBGArenas = sConfig.GetFloatDefault("Visibility.Distance.BGArenas", DEFAULT_VISIBILITY_BGARENAS);
if (m_MaxVisibleDistanceInBG < 45 * sWorld.getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO)) 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)); sLog.outError("Visibility.Distance.BGArenas can't be less max aggro radius %f", 45 * getConfig(CONFIG_FLOAT_RATE_CREATURE_AGGRO));
m_MaxVisibleDistanceInBG = 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); sLog.outError("Visibility.Distance.BGArenas can't be greater %f", MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance);
m_MaxVisibleDistanceInBG = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance; m_MaxVisibleDistanceInBGArenas = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance;
} }
m_MaxVisibleDistanceInFlight = sConfig.GetFloatDefault("Visibility.Distance.InFlight", DEFAULT_VISIBILITY_DISTANCE); m_MaxVisibleDistanceInFlight = sConfig.GetFloatDefault("Visibility.Distance.InFlight", DEFAULT_VISIBILITY_DISTANCE);

4
src/game/WorldHandlers/World.h
View File

@ -581,7 +581,7 @@ class World
// for max speed access // for max speed access
static float GetMaxVisibleDistanceOnContinents() { return m_MaxVisibleDistanceOnContinents; } static float GetMaxVisibleDistanceOnContinents() { return m_MaxVisibleDistanceOnContinents; }
static float GetMaxVisibleDistanceInInstances() { return m_MaxVisibleDistanceInInstances; } 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 GetMaxVisibleDistanceInFlight() { return m_MaxVisibleDistanceInFlight; }
static float GetVisibleUnitGreyDistance() { return m_VisibleUnitGreyDistance; } static float GetVisibleUnitGreyDistance() { return m_VisibleUnitGreyDistance; }
@ -688,7 +688,7 @@ class World
// for max speed access // for max speed access
static float m_MaxVisibleDistanceOnContinents; static float m_MaxVisibleDistanceOnContinents;
static float m_MaxVisibleDistanceInInstances; static float m_MaxVisibleDistanceInInstances;
static float m_MaxVisibleDistanceInBG; static float m_MaxVisibleDistanceInBGArenas;
static float m_MaxVisibleDistanceInFlight; static float m_MaxVisibleDistanceInFlight;
static float m_VisibleUnitGreyDistance; static float m_VisibleUnitGreyDistance;