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/gameserver.h
parent1e0df536c2fae85c317ce9c3cc17603d5f98c911 (diff)
various user interface related updates
Diffstat (limited to 'src/core/gameserver.h')
-rw-r--r--src/core/gameserver.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/gameserver.h b/src/core/gameserver.h
index 550dd99..4ea476b 100644
--- a/src/core/gameserver.h
+++ b/src/core/gameserver.h
@@ -37,7 +37,7 @@ public:
virtual bool interactive() const;
/// current server game time
- virtual inline float time() const { return server_time; }
+ virtual inline unsigned long timestamp() const { return server_timestamp; }
/*----- mutators -------------------------------------------------- */
@@ -48,7 +48,7 @@ public:
void player_disconnect(Player *player);
/// run a game server time frame
- void frame(float seconds);
+ void frame(unsigned long timestamp);
/// a player sends a chat message to the public channel
void say(Player *player, std::string const &args);
@@ -104,9 +104,10 @@ private:
NetServer *server_network;
unsigned int server_maxplayerid;
- float server_frametime;
- float server_time;
- float server_previoustime;
+
+ unsigned long server_timestamp;
+ unsigned long server_previoustime;
+ unsigned long server_startup;
};
inline GameServer *server() { return GameServer::instance(); }