pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 19:51:29 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

General cleanup

Browse Source
This commit is contained in:
Akkadius 2015-01-19 03:25:46 -06:00
parent ab4595f56d
commit d45bc6d26a
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zone/net.cpp
View File

@ -348,15 +348,10 @@ int main(int argc, char** argv) {
//Advance the timer to our current point in time //Advance the timer to our current point in time
Timer::SetCurrentTime(); Timer::SetCurrentTime();
//process stuff from world
worldserver.Process(); worldserver.Process();
if (!eqsf.IsOpen() && Config->ZonePort!=0) { if (!eqsf.IsOpen() && Config->ZonePort!=0) {
Log.Out(Logs::Detail, Logs::Zone_Server, "Starting EQ Network server on port %d",Config->ZonePort); 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)) { if (!eqsf.Open(Config->ZonePort)) {
Log.Out(Logs::General, Logs::Error, "Failed to open port %d",Config->ZonePort); Log.Out(Logs::General, Logs::Error, "Failed to open port %d",Config->ZonePort);
ZoneConfig::SetZonePort(0); ZoneConfig::SetZonePort(0);
@ -429,10 +424,8 @@ int main(int argc, char** argv) {
if(net.raid_timer.Enabled() && net.raid_timer.Check()) if(net.raid_timer.Enabled() && net.raid_timer.Check())
entity_list.RaidProcess(); entity_list.RaidProcess();
entity_list.Process(); entity_list.Process();
entity_list.MobProcess();
entity_list.MobProcess();
entity_list.BeaconProcess(); entity_list.BeaconProcess();
if (zone) { if (zone) {
@ -462,7 +455,7 @@ int main(int argc, char** argv) {
} }
#endif #endif
#endif #endif
} //end extra profiler block } //end extra profiler block
Sleep(ZoneTimerResolution); Sleep(ZoneTimerResolution);
} }
@ -504,8 +497,7 @@ void Shutdown()
{ {
Zone::Shutdown(true); Zone::Shutdown(true);
RunLoops = false; RunLoops = false;
worldserver.Disconnect(); worldserver.Disconnect();
// safe_delete(worldserver);
Log.Out(Logs::Detail, Logs::Zone_Server, "Shutting down..."); Log.Out(Logs::Detail, Logs::Zone_Server, "Shutting down...");
} }

2
zone/worldserver.cpp
View File

@ -131,7 +131,7 @@ void WorldServer::OnConnected() {
SendPacket(pack); SendPacket(pack);
safe_delete(pack); safe_delete(pack);
} }
/* Zone Process Packets from World */
void WorldServer::Process() { void WorldServer::Process() {
WorldConnection::Process(); WorldConnection::Process();