From ce3d3153d83823a1480617b9a9c4e8c620ebb47b Mon Sep 17 00:00:00 2001 From: Akkadius Date: Tue, 19 Nov 2024 02:16:11 -0600 Subject: [PATCH] Little bit of cleanup --- common/emu_constants.h | 5 +++-- zone/client.cpp | 2 +- zone/client_packet.cpp | 19 ++++++++++--------- zone/command.cpp | 2 -- zone/command.h | 1 - zone/gm_commands/test.cpp | 14 -------------- zone/mob.cpp | 2 +- 7 files changed, 15 insertions(+), 30 deletions(-) delete mode 100755 zone/gm_commands/test.cpp diff --git a/common/emu_constants.h b/common/emu_constants.h index 7da8196d3..5818ad477 100644 --- a/common/emu_constants.h +++ b/common/emu_constants.h @@ -457,10 +457,11 @@ enum ServerLockType : int { Unlock }; -enum Invisibility : uint8 { +enum Invisibility : uint16 { Visible, Invisible, - Special = 255 + Special = 255, + GMInvis = 3001 }; enum AugmentActions : int { diff --git a/zone/client.cpp b/zone/client.cpp index ac1720768..366d7e3aa 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -13168,7 +13168,7 @@ void Client::BroadcastPositionUpdate() void Client::SetVisibility(Mob* mob, bool visible) { mob->SendAppearancePacket( AppearanceType::Invisibility, - visible ? m_invisibility_state : 3001, // reset back to original visibility state when visible + visible ? m_invisibility_state : Invisibility::GMInvis, // reset back to original visibility state when visible false, true, this diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index dbfe26dd8..4116f7a04 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -4960,19 +4960,20 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) { CheckScanCloseMobsMovingTimer(); } - // see_close - if (moving) { - if (m_see_close_mobs_timer.GetRemainingTime() > 1000) { + if (RuleB(Zone, EnableEntityClipping)) { + if (moving) { + if (m_see_close_mobs_timer.GetRemainingTime() > 1000) { + m_see_close_mobs_timer.Disable(); + m_see_close_mobs_timer.Start(1000); + m_see_close_mobs_timer.Trigger(); + } + } + else if (m_see_close_mobs_timer.GetDuration() == 1000) { m_see_close_mobs_timer.Disable(); - m_see_close_mobs_timer.Start(1000); + m_see_close_mobs_timer.Start(60000); m_see_close_mobs_timer.Trigger(); } } - else if (m_see_close_mobs_timer.GetDuration() == 1000) { - m_see_close_mobs_timer.Disable(); - m_see_close_mobs_timer.Start(60000); - m_see_close_mobs_timer.Trigger(); - } CheckSendBulkClientPositionUpdate(); diff --git a/zone/command.cpp b/zone/command.cpp index 1df75a9ca..35b920e53 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -225,7 +225,6 @@ int command_init(void) command_add("suspend", "[name] [days] [reason] - Suspend by character name and for specificed number of days", AccountStatus::GMLeadAdmin, command_suspend) || command_add("suspendmulti", "[Character Name One|Character Name Two|etc] [Days] [Reason] - Suspend multiple characters by name for specified number of days", AccountStatus::GMLeadAdmin, command_suspendmulti) || command_add("takeplatinum", "[Platinum] - Takes specified amount of platinum from you or your player target", AccountStatus::GMMgmt, command_takeplatinum) || - command_add("test", "Test Command", AccountStatus::GMLeadAdmin, command_test) || command_add("task", "(subcommand) - Task system commands", AccountStatus::GMLeadAdmin, command_task) || command_add("petname", "[newname] - Temporarily renames your pet. Leave name blank to restore the original name.", AccountStatus::GMAdmin, command_petname) || command_add("traindisc", "[level] - Trains all the disciplines usable by the target, up to level specified. (may freeze client for a few seconds)", AccountStatus::GMLeadAdmin, command_traindisc) || @@ -921,7 +920,6 @@ void command_bot(Client *c, const Seperator *sep) #include "gm_commands/suspend.cpp" #include "gm_commands/suspendmulti.cpp" #include "gm_commands/takeplatinum.cpp" -#include "gm_commands/test.cpp" #include "gm_commands/task.cpp" #include "gm_commands/traindisc.cpp" #include "gm_commands/tune.cpp" diff --git a/zone/command.h b/zone/command.h index 0b78b555e..09164e6bf 100644 --- a/zone/command.h +++ b/zone/command.h @@ -179,7 +179,6 @@ void command_summonitem(Client *c, const Seperator *sep); void command_suspend(Client *c, const Seperator *sep); void command_suspendmulti(Client *c, const Seperator *sep); void command_takeplatinum(Client* c, const Seperator* sep); -void command_test(Client *c, const Seperator *sep); void command_task(Client *c, const Seperator *sep); void command_petname(Client *c, const Seperator *sep); void command_traindisc(Client *c, const Seperator *sep); diff --git a/zone/gm_commands/test.cpp b/zone/gm_commands/test.cpp deleted file mode 100755 index c8ebc5e8f..000000000 --- a/zone/gm_commands/test.cpp +++ /dev/null @@ -1,14 +0,0 @@ - -void command_test(Client *c, const Seperator *sep) -{ - const int arguments = sep->argnum; - - for (auto &e : entity_list.GetMobList()) { - auto mob = e.second; - if (Distance(c->GetPosition(), mob->GetPosition()) > 100) { - mob->SendAppearancePacket(AppearanceType::Invisibility, 3001); - } else { - mob->SendAppearancePacket(AppearanceType::Invisibility, 0); - } - } -} diff --git a/zone/mob.cpp b/zone/mob.cpp index aee064e8a..ad2f8a229 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -4127,7 +4127,7 @@ void Mob::SendAppearancePacket( auto outapp = new EQApplicationPacket(OP_SpawnAppearance, sizeof(SpawnAppearance_Struct)); auto* a = (SpawnAppearance_Struct*)outapp->pBuffer; - if (type == AppearanceType::Invisibility && value != 3001) { + if (type == AppearanceType::Invisibility && value != Invisibility::GMInvis) { m_invisibility_state = value; }