mirror of
https://github.com/EQEmu/Server.git
synced 2026-08-29 04:28:00 +00:00
[Feature] Add Parcel Feature for RoF2 Clients (#4198)
* Add Parcel Feature Add the parcel system for RoF2 client * Fixed a duplicate define * Reformat reformating and review changes * Further Formatting * Memory Mgmt Updates Refactored to using unique_ptr/make_unique/etc to avoid manual memory mgmt. Other format changes * Refactor db structure Refactor for db structure of parcels to character_parcels Removal of parcel_merchants Addition of npc_types.is_parcel_merchant Cleanup as a result * Refactor to use item id 99990 for money transfers. Removed the money string function as a result, though simplified the messaging related to money. Other updates based on feedback. * Move prune routine out of scheduler and into a world process. Removed RuleI from #define * Update * Update database.cpp * Update database_update_manifest.cpp * Update main.cpp * Update client_process.cpp * Update parcels.cpp * Remove parcel merchant content to optional sql instead of manifest. --------- Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#include "world_event_scheduler.h"
|
||||
#include "../common/servertalk.h"
|
||||
#include <ctime>
|
||||
#include "../common/rulesys.h"
|
||||
|
||||
void WorldEventScheduler::Process(ZSList *zs_list)
|
||||
{
|
||||
@@ -31,13 +32,10 @@ void WorldEventScheduler::Process(ZSList *zs_list)
|
||||
);
|
||||
|
||||
for (auto &e: m_events) {
|
||||
|
||||
// discard uninteresting events as its less work to calculate time on events we don't care about
|
||||
// different processes are interested in different events
|
||||
if (
|
||||
e.event_type != ServerEvents::EVENT_TYPE_BROADCAST &&
|
||||
e.event_type != ServerEvents::EVENT_TYPE_RELOAD_WORLD
|
||||
) {
|
||||
if (e.event_type != ServerEvents::EVENT_TYPE_BROADCAST &&
|
||||
e.event_type != ServerEvents::EVENT_TYPE_RELOAD_WORLD) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -57,7 +55,7 @@ void WorldEventScheduler::Process(ZSList *zs_list)
|
||||
if (e.event_type == ServerEvents::EVENT_TYPE_RELOAD_WORLD) {
|
||||
LogScheduler("Sending reload world event [{}]", e.event_data.c_str());
|
||||
|
||||
auto pack = new ServerPacket(ServerOP_ReloadWorld, sizeof(ReloadWorld_Struct));
|
||||
auto pack = new ServerPacket(ServerOP_ReloadWorld, sizeof(ReloadWorld_Struct));
|
||||
auto *reload_world = (ReloadWorld_Struct *) pack->pBuffer;
|
||||
reload_world->global_repop = ReloadWorld::Repop;
|
||||
zs_list->SendPacket(pack);
|
||||
|
||||
Reference in New Issue
Block a user