diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Makefile.am | 5 | ||||
| -rw-r--r-- | src/core/application.cc | 8 | ||||
| -rw-r--r-- | src/core/gameconnection.cc | 2 | ||||
| -rw-r--r-- | src/core/gameserver.cc | 3 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index efa4e7b..8b99c72 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -5,8 +5,9 @@ libcore_la_SOURCES = application.cc commandbuffer.cc clientstate.cc core.cc cvar func.cc gameconnection.cc gameinterface.cc gameserver.cc module.cc netclient.cc \ netconnection.cc netserver.cc player.cc stats.cc libcore_la_LDFLAGS = -avoid-version -no-undefined -libcore_la_LIBADD = $(top_builddir)/src/filesystem/libfilesystem.la \ - $(top_builddir)/src/math/libmath.la $(top_builddir)/src/sys/libsys.la $(top_builddir)/src/model/libmodel.la +libcore_la_LIBADD = $(top_builddir)/src/model/libmodel.la \ + $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/math/libmath.la $(top_builddir)/src/sys/libsys.la \ + $(top_builddir)/src/auxiliary/libauxiliary.la noinst_LTLIBRARIES = libcore.la noinst_HEADERS = application.h commandbuffer.h clientstate.h core.h cvar.h entity.h func.h \ diff --git a/src/core/application.cc b/src/core/application.cc index 2ff7bb0..be1dcac 100644 --- a/src/core/application.cc +++ b/src/core/application.cc @@ -100,10 +100,10 @@ Application::Application() application_game = 0; #ifndef _WIN32 - sys::signal(SIGHUP, signal_handler); - sys::signal(SIGINT, signal_handler); - sys::signal(SIGQUIT, signal_handler); - sys::signal(SIGTERM, signal_handler); + //sys::signal(SIGHUP, signal_handler); + //sys::signal(SIGINT, signal_handler); + //sys::signal(SIGQUIT, signal_handler); + //sys::signal(SIGTERM, signal_handler); #endif } diff --git a/src/core/gameconnection.cc b/src/core/gameconnection.cc index c86a0ae..e77a3d8 100644 --- a/src/core/gameconnection.cc +++ b/src/core/gameconnection.cc @@ -104,7 +104,7 @@ void GameConnection::frame(float seconds) } } - if (localcontrol() && localcontrol()->dirty()) { + if ((connection_network->state() == NetConnection::Connected) && localcontrol() && localcontrol()->dirty()) { std::ostringstream netmsg; netmsg << "cup " << localcontrol()->id() << " "; localcontrol()->serialize_client_update(netmsg); diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc index 5064ccd..98823e0 100644 --- a/src/core/gameserver.cc +++ b/src/core/gameserver.cc @@ -6,6 +6,7 @@ #include <iomanip> +#include "auxiliary/functions.h" #include "sys/sys.h" #include "core/cvar.h" #include "core/func.h" @@ -132,7 +133,7 @@ void GameServer::list_players(Player *player) } msgstr.str(""); - msgstr << count << " connected players"; + msgstr << count << " connected " << aux::plural("player", count); send(player, msgstr.str()); } |