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>2008-10-16 16:34:15 +0000
committerStijn Buys <ingar@osirion.org>2008-10-16 16:34:15 +0000
commit1a28393dabf4f4696bf433ddde52e7a25253c955 (patch)
tree4d4fa4034f30fc882a78ab6ea148a32e83b9e88c /src/core/gameconnection.h
parent1e0df536c2fae85c317ce9c3cc17603d5f98c911 (diff)
various user interface related updates
Diffstat (limited to 'src/core/gameconnection.h')
-rw-r--r--src/core/gameconnection.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/gameconnection.h b/src/core/gameconnection.h
index 95df9f3..70e3015 100644
--- a/src/core/gameconnection.h
+++ b/src/core/gameconnection.h
@@ -32,12 +32,12 @@ public:
inline bool interactive() const { return true; }
/// return the current game time
- inline float time() const { return game_clientframetime; }
+ inline unsigned long timestamp() const { return connection_timestamp; }
/*----- mutators -------------------------------------------------- */
/// run a game connection time frame
- void frame(float seconds);
+ void frame(unsigned long timestamp);
/// forward a command line to the remote server
void forward(std::string const &cmdline);
@@ -59,10 +59,11 @@ protected:
private:
bool connection_running;
- static GameConnection *connection_instance;
+ unsigned long connection_timestamp; // server game time
+ unsigned long connection_netframe; // last network frame timestamp
+
NetConnection *connection_network;
- float connection_frametime;
-
+ static GameConnection *connection_instance;
};
inline GameConnection *connection() { return GameConnection::instance(); }