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

[Code] ZSList Global to Singleton Cleanup (#4940)

Browse Source 
* [Code] ZSList Global to Singleton Cleanup

* Final

* Post merge fixes

---------

Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
Alex King
2025-06-25 16:16:44 -04:00
committed by GitHub
parent 643ee56433
commit dc261bb203
24 changed files with 266 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/adventure.cpp
+7 -8
View File
@@ -15,7 +15,6 @@
#include "../common/zone_store.h"
#include "../common/repositories/character_corpses_repository.h"
extern ZSList zoneserver_list;
extern ClientList client_list;
extern EQ::Random emu_random;
@@ -176,7 +175,7 @@ void Adventure::SetStatus(AdventureStatus new_status)
ut->instance_id = instance_id;
ut->new_duration = adventure_template->duration + 60;
zoneserver_list.SendPacket(0, instance_id, pack);
ZSList::Instance()->SendPacket(0, instance_id, pack);
safe_delete(pack);
}
else if(new_status == AS_WaitingForSecondaryEndTime)
@@ -190,7 +189,7 @@ void Adventure::SetStatus(AdventureStatus new_status)
ut->instance_id = instance_id;
ut->new_duration = 1860;
zoneserver_list.SendPacket(0, instance_id, pack);
ZSList::Instance()->SendPacket(0, instance_id, pack);
safe_delete(pack);
}
else if(new_status == AS_Finished)
@@ -204,7 +203,7 @@ void Adventure::SetStatus(AdventureStatus new_status)
ut->instance_id = instance_id;
ut->new_duration = 1860;
zoneserver_list.SendPacket(0, instance_id, pack);
ZSList::Instance()->SendPacket(0, instance_id, pack);
safe_delete(pack);
}
else
@@ -233,7 +232,7 @@ void Adventure::SendAdventureMessage(uint32 type, const char *msg)
if(current)
{
strcpy(sms->to, (*iter).c_str());
zoneserver_list.SendPacket(current->zone(), current->instance(), pack);
ZSList::Instance()->SendPacket(current->zone(), current->instance(), pack);
}
++iter;
}
@@ -309,7 +308,7 @@ void Adventure::Finished(AdventureWinStatus ws)
af->win = false;
af->points = 0;
}
zoneserver_list.SendPacket(current->zone(), current->instance(), pack);
ZSList::Instance()->SendPacket(current->zone(), current->instance(), pack);
database.UpdateAdventureStatsEntry(character_id, GetTemplate()->theme, (ws != AWS_Lose) ? true : false);
delete pack;
}
@@ -395,7 +394,7 @@ void Adventure::MoveCorpsesToGraveyard()
d->InstanceID = 0;
d->ZoneID = GetTemplate()->graveyard_zone_id;
zoneserver_list.SendPacket(0, GetInstanceID(), pack);
ZSList::Instance()->SendPacket(0, GetInstanceID(), pack);
delete pack;
@@ -406,7 +405,7 @@ void Adventure::MoveCorpsesToGraveyard()
spc->player_corpse_id = e.id;
spc->zone_id = GetTemplate()->graveyard_zone_id;
zoneserver_list.SendPacket(spc->zone_id, 0, pack);
ZSList::Instance()->SendPacket(spc->zone_id, 0, pack);
delete pack;
}