diff options
author | Stijn Buys <ingar@osirion.org> | 2011-02-04 13:23:05 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2011-02-04 13:23:05 +0000 |
commit | a69521970793424754421c8a5fba2eb465e817e6 (patch) | |
tree | f44f178a27f621f0f11ed5959418d83ee399ffcd /src/core/gameconnection.h | |
parent | 7129e31075e021112ba6a859af29513e69671626 (diff) |
Made time(), timestamp() and related methods non-virtual, corrects a crash when
the dedicated server quits.
Diffstat (limited to 'src/core/gameconnection.h')
-rw-r--r-- | src/core/gameconnection.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/core/gameconnection.h b/src/core/gameconnection.h index 89c3aff..fdd5daf 100644 --- a/src/core/gameconnection.h +++ b/src/core/gameconnection.h @@ -20,31 +20,10 @@ public: GameConnection(std::string const &connectionstr); virtual ~GameConnection(); - /*----- inspectors ------------------------------------------------ */ - - /// returns true if the game connection can run a time frime - inline bool running() const { - return connection_running; - } - - /// returns true if the game connection can not run a time frime - inline bool error() const { - return !connection_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; - /*----- mutators -------------------------------------------------- */ /// run a game connection time frame - void frame(unsigned long timestamp); + virtual void frame(unsigned long timestamp); /// forward a command line to the remote server void forward(std::string const &cmdline); @@ -64,7 +43,6 @@ public: /// request inventory for entity with id virtual Inventory *request_inventory(Entity *entity); - /*----- static ---------------------------------------------------- */ /// return the current game connection @@ -72,13 +50,7 @@ public: return connection_instance; } -protected: - /// abort runing - void abort(); - private: - bool connection_running; - unsigned long connection_timestamp; // server game time unsigned long connection_netframe; // last network frame timestamp NetConnection *connection_network; |