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

Cleanup

Browse Source
This commit is contained in:
Akkadius
2023-10-31 01:02:41 -05:00
parent f5848516b4
commit 64b58bfc52
7 changed files with 30 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/questmgr.cpp
+2 -15
View File
@@ -360,26 +360,13 @@ Mob *QuestManager::spawn_from_spawn2(uint32 spawn2_id)
void QuestManager::enable_spawn2(uint32 spawn2_id)
{
database.UpdateSpawn2Status(spawn2_id, 1, zone->GetInstanceID());
auto pack = new ServerPacket(ServerOP_SpawnStatusChange, sizeof(ServerSpawnStatusChange_Struct));
auto *ssc = (ServerSpawnStatusChange_Struct *) pack->pBuffer;
ssc->id = spawn2_id;
ssc->new_status = true;
ssc->instance_id = zone->GetInstanceID();
worldserver.SendPacket(pack);
safe_delete(pack);
zone->SetSpawn2Disabled(spawn2_id, false);
}
void QuestManager::disable_spawn2(uint32 spawn2_id)
{
database.UpdateSpawn2Status(spawn2_id, 0, zone->GetInstanceID());
auto pack = new ServerPacket(ServerOP_SpawnStatusChange, sizeof(ServerSpawnStatusChange_Struct));
auto *ssc = (ServerSpawnStatusChange_Struct *) pack->pBuffer;
ssc->id = spawn2_id;
ssc->new_status = false;
ssc->instance_id = zone->GetInstanceID();
worldserver.SendPacket(pack);
safe_delete(pack);
zone->SetSpawn2Disabled(spawn2_id, true);
}
void QuestManager::setstat(int stat, int value) {
zone/worldserver.cpp
-32
View File
@@ -1724,38 +1724,6 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
break;
}
case ServerOP_SpawnStatusChange:
{
if (zone)
{
ServerSpawnStatusChange_Struct *ssc = (ServerSpawnStatusChange_Struct*)pack->pBuffer;
if (ssc->instance_id != zone->GetInstanceID()) {
break;
}
LinkedListIterator<Spawn2 *> iterator(zone->spawn2_list);
iterator.Reset();
Spawn2 *found_spawn = nullptr;
while (iterator.MoreElements()) {
Spawn2 *cur = iterator.GetData();
if (cur->GetID() == ssc->id) {
found_spawn = cur;
break;
}
iterator.Advance();
}
if (found_spawn) {
if (ssc->new_status == 0) {
found_spawn->Disable();
}
else {
found_spawn->Enable();
}
}
}
break;
}
case ServerOP_QGlobalUpdate:
{
if (pack->size != sizeof(ServerQGlobalUpdate_Struct))
zone/zone.cpp
+24
View File
@@ -3160,3 +3160,27 @@ void Zone::ReloadContentFlags()
safe_delete(pack);
}
void Zone::SetSpawn2Disabled(uint32 spawn2_id, bool disabled)
{
LinkedListIterator<Spawn2 *> iterator(spawn2_list);
iterator.Reset();
Spawn2 *found_spawn = nullptr;
while (iterator.MoreElements()) {
Spawn2 *cur = iterator.GetData();
if (cur->GetID() == spawn2_id) {
found_spawn = cur;
break;
}
iterator.Advance();
}
if (found_spawn) {
if (disabled) {
found_spawn->Disable();
}
else {
found_spawn->Enable();
}
}
}
zone/zone.h
+1
View File
@@ -398,6 +398,7 @@ public:
void ReloadContentFlags();
void SetSpawn2Disabled(uint32 spawn2_id, bool disabled);
private:
bool allow_mercs;
bool can_bind;
zone/zonedb.cpp
+2 -2
View File
@@ -188,8 +188,8 @@ void ZoneDatabase::UpdateSpawn2Status(uint32 id, uint8 new_status, uint32 instan
}
auto spawn = Spawn2DisabledRepository::NewEntity();
spawn.spawn2_id = id;
spawn.instance_id = instance_id;
spawn.spawn2_id = (int32_t) id;
spawn.instance_id = (int32_t) instance_id;
spawn.disabled = new_status ? 0 : 1;
Spawn2DisabledRepository::InsertOne(*this, spawn);
}