From 1a28393dabf4f4696bf433ddde52e7a25253c955 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Thu, 16 Oct 2008 16:34:15 +0000 Subject: various user interface related updates --- src/core/gameinterface.h | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) (limited to 'src/core/gameinterface.h') diff --git a/src/core/gameinterface.h b/src/core/gameinterface.h index fea86fe..c916d15 100644 --- a/src/core/gameinterface.h +++ b/src/core/gameinterface.h @@ -30,20 +30,6 @@ public: /// return the local player inline Player *localplayer() { return &game_localplayer; } - /// return the server time of the last received server frame - inline float serverframetime() const { return game_serverframetime; } - - /// return the server time of the previous received server frame - inline float previousframetime() const { return game_previousframetime; } - - /// return the server time of the previous received server frame - inline float clientframetime() const { return game_clientframetime; } - - /// client frame time between previousframetime and serverframetime, from 0 - 1 - float timeoffset(); - - inline float timestep() const { return game_timestep; } - inline Players & players() { return game_players; } /// show a list of connected players @@ -58,7 +44,10 @@ public: virtual bool interactive() const = 0; /// return the current game time - virtual float time() const = 0; + virtual unsigned long timestamp() const = 0; + + /// return the current game time, in seconds + float time() const { return ((float)(timestamp()) / 1000.0f); } /*----- mutators ------------------------------------------------- */ @@ -66,18 +55,18 @@ public: void clear(); /// reset the client state - void reset_clientstate(float timestamp, float prevtimestamp); + void reset_clientstate(); /// update the client state timers - void update_clientstate(float seconds); + void update_clientstate(); void update_entity_clientstate(Entity *entity); /*----- virtual mutators ------------------------------------------ */ /// run one game time frame - /// @param seconds time since the previous frame, in seconds - virtual void frame(float seconds) = 0; + /// @param timestamp current application time + virtual void frame(unsigned long timestamp) = 0; protected: /// the local player @@ -85,14 +74,6 @@ protected: /// all the players Players game_players; - - float game_serverframetime; - float game_previousframetime; - - float game_timestep; - float game_clientframetime; - - unsigned int game_serverframelength; }; /// global local player instance -- cgit v1.2.3