From a69521970793424754421c8a5fba2eb465e817e6 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Fri, 4 Feb 2011 13:23:05 +0000 Subject: Made time(), timestamp() and related methods non-virtual, corrects a crash when the dedicated server quits. --- src/core/gameserver.h | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'src/core/gameserver.h') diff --git a/src/core/gameserver.h b/src/core/gameserver.h index 775c41c..f0cf88b 100644 --- a/src/core/gameserver.h +++ b/src/core/gameserver.h @@ -27,25 +27,6 @@ public: /*----- inspectors ------------------------------------------------ */ - /// returns true if the game server can run a time frime - inline bool running() const { - return server_running; - } - - /// returns true if the game server can not run a time frime - inline bool error() const { - return !server_running; - } - - /// returns true if the game is running an interactive module - virtual bool interactive() const; - - /// return the current game time in seconds - virtual float time() const; - - /// return the current game time - virtual unsigned long timestamp() const; - /// current module inline const Module *module() const { return server_module; @@ -101,21 +82,16 @@ public: return server_instance; } -protected: - /// abort runing - void abort(); - private: void load_config(); void save_config(); - bool server_running; + Module *server_module; static GameServer *server_instance; NetServer *server_network; unsigned int server_maxplayerid; - unsigned long server_timestamp; unsigned long server_previoustime; unsigned long server_startup; }; -- cgit v1.2.3