pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-13 06:48:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More cleanup 1

Browse Source
This commit is contained in:
nytmyr
2025-01-23 13:28:12 -06:00
parent 3ac3861007
commit 529d26a132
7 changed files with 706 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/aggro.cpp
+5 -5
View File
@@ -1295,8 +1295,8 @@ bool Mob::CheckLosFN(glm::vec3 posWatcher, float sizeWatcher, glm::vec3 posTarge
return zone->zonemap->CheckLoS(posWatcher, posTarget);
}
bool Mob::CheckPositioningLosFN(Mob* other, float posX, float posY, float posZ) {
if (zone->zonemap == nullptr) {
bool Mob::CheckPositioningLosFN(Mob* other, float x, float y, float z) {
if (!zone->zonemap) {
//not sure what the best return is on error
//should make this a database variable, but im lazy today
#ifdef LOS_DEFAULT_CAN_SEE
@@ -1318,9 +1318,9 @@ bool Mob::CheckPositioningLosFN(Mob* other, float posX, float posY, float posZ)
oloc.y = other->GetY();
oloc.z = other->GetZ() + (other->GetSize() == 0.0 ? LOS_DEFAULT_HEIGHT : other->GetSize()) / 2 * SEE_POSITION;
myloc.x = posX;
myloc.y = posY;
myloc.z = posZ + (GetSize() == 0.0 ? LOS_DEFAULT_HEIGHT : GetSize()) / 2 * HEAD_POSITION;
myloc.x = x;
myloc.y = y;
myloc.z = z + (GetSize() == 0.0 ? LOS_DEFAULT_HEIGHT : GetSize()) / 2 * HEAD_POSITION;
#if LOSDEBUG>=5
LogDebug("LOS from ([{}], [{}], [{}]) to ([{}], [{}], [{}]) sizes: ([{}], [{}])", myloc.x, myloc.y, myloc.z, oloc.x, oloc.y, oloc.z, GetSize(), mobSize);
zone/attack.cpp
+2 -2
View File
@@ -1250,8 +1250,8 @@ int64 Mob::GetWeaponDamage(Mob *against, const EQ::ItemInstance *weapon_item, in
(
!IsBot() ||
(IsBot() && !RuleB(Bots, AllowBotEquipAnyClassGear))
)
) {
)
) {
return 0;
}
zone/bot.cpp
+535 -234
View File
File diff suppressed because it is too large Load Diff
zone/bot.h
+2 -2
View File
@@ -1112,7 +1112,7 @@ private:
unsigned int RestRegenMana;
unsigned int RestRegenEndurance;
Timer rest_timer;
Timer ping_timer;
Timer m_ping_timer;
int32 base_end;
int32 cur_end;
int32 max_end;
@@ -1121,7 +1121,7 @@ private:
Timer m_rogue_evade_timer; // Rogue evade timer
Timer m_monk_evade_timer; // Monk evade FD timer
Timer m_auto_defend_timer;
Timer auto_save_timer;
Timer m_auto_save_timer;
Timer m_combat_jitter_timer;
bool m_combat_jitter_flag;