Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2011-02-04 13:23:05 +0000
committerStijn Buys <ingar@osirion.org>2011-02-04 13:23:05 +0000
commita69521970793424754421c8a5fba2eb465e817e6 (patch)
treef44f178a27f621f0f11ed5959418d83ee399ffcd /src/core/gameserver.h
parent7129e31075e021112ba6a859af29513e69671626 (diff)
Made time(), timestamp() and related methods non-virtual, corrects a crash when
the dedicated server quits.
Diffstat (limited to 'src/core/gameserver.h')
-rw-r--r--src/core/gameserver.h26
1 files changed, 1 insertions, 25 deletions
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;
};