From d45bc6d26a4ff9fd102ad6829c4100bc331cf2c6 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Mon, 19 Jan 2015 03:25:46 -0600 Subject: [PATCH] General cleanup --- zone/net.cpp | 16 ++++------------ zone/worldserver.cpp | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/zone/net.cpp b/zone/net.cpp index c2ec1b629..40ad52616 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -348,15 +348,10 @@ int main(int argc, char** argv) { //Advance the timer to our current point in time Timer::SetCurrentTime(); - //process stuff from world worldserver.Process(); if (!eqsf.IsOpen() && Config->ZonePort!=0) { Log.Out(Logs::Detail, Logs::Zone_Server, "Starting EQ Network server on port %d",Config->ZonePort); - - // log_sys.CloseZoneLogs(); - // log_sys.StartZoneLogs(StringFormat("%s_ver-%u_instid-%u_port-%u", zone->GetShortName(), zone->GetInstanceVersion(), zone->GetInstanceID(), ZoneConfig::get()->ZonePort)); - if (!eqsf.Open(Config->ZonePort)) { Log.Out(Logs::General, Logs::Error, "Failed to open port %d",Config->ZonePort); ZoneConfig::SetZonePort(0); @@ -429,10 +424,8 @@ int main(int argc, char** argv) { if(net.raid_timer.Enabled() && net.raid_timer.Check()) entity_list.RaidProcess(); - entity_list.Process(); - - entity_list.MobProcess(); - + entity_list.Process(); + entity_list.MobProcess(); entity_list.BeaconProcess(); if (zone) { @@ -462,7 +455,7 @@ int main(int argc, char** argv) { } #endif #endif - } //end extra profiler block + } //end extra profiler block Sleep(ZoneTimerResolution); } @@ -504,8 +497,7 @@ void Shutdown() { Zone::Shutdown(true); RunLoops = false; - worldserver.Disconnect(); - // safe_delete(worldserver); + worldserver.Disconnect(); Log.Out(Logs::Detail, Logs::Zone_Server, "Shutting down..."); } diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index f3211b7e1..d08384515 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -131,7 +131,7 @@ void WorldServer::OnConnected() { SendPacket(pack); safe_delete(pack); } - +/* Zone Process Packets from World */ void WorldServer::Process() { WorldConnection::Process();