Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-12-26 12:21:48 +0000
committerStijn Buys <ingar@osirion.org>2008-12-26 12:21:48 +0000
commitb875124824794a7762414db76ed9f953b8ba320f (patch)
tree86f27d64e4a9e91a93cb4b30752f27eeec6526ac /src/core
parentbfa10f9990a8a045b03474d11af75984c12a856a (diff)
default player settings in player.ini,
palette text colors, cleanups
Diffstat (limited to 'src/core')
-rw-r--r--src/core/gameserver.cc2
-rw-r--r--src/core/gameserver.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index f614fa9..44b8ccb 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -205,7 +205,7 @@ GameServer::~GameServer()
save_config();
if (server_module) {
- if (server_module->running() && !Cvar::sv_dedicated->value())
+ if (!Cvar::sv_dedicated->value())
player_disconnect(localplayer());
delete server_module;
diff --git a/src/core/gameserver.h b/src/core/gameserver.h
index 8d9ca9b..59db0c5 100644
--- a/src/core/gameserver.h
+++ b/src/core/gameserver.h
@@ -39,6 +39,9 @@ public:
/// current server game time
virtual inline unsigned long timestamp() const { return server_timestamp; }
+ /// current module
+ inline const Module *module() const { return server_module; }
+
/*----- mutators -------------------------------------------------- */
/// is called when a player connects to the game server