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-05-11 14:48:17 +0000
committerStijn Buys <ingar@osirion.org>2011-05-11 14:48:17 +0000
commit1c63cbf204b1d2c667ce9f821ccb197d0ffb0ac3 (patch)
treec2d0ff7cc4a8a264657abd0ac99017a5b664ecd2 /src/dedicated
parentbb0f860989f84b901f80017ae0139a3fc0446dc1 (diff)
Review of the main loop timer, converted timers from float to unsigned long,
corrected a number of timing bugs, improved client framerate stability.
Diffstat (limited to 'src/dedicated')
-rw-r--r--src/dedicated/console.cc1
-rw-r--r--src/dedicated/dedicated.cc6
2 files changed, 1 insertions, 6 deletions
diff --git a/src/dedicated/console.cc b/src/dedicated/console.cc
index fd61ffe..10fe261 100644
--- a/src/dedicated/console.cc
+++ b/src/dedicated/console.cc
@@ -222,7 +222,6 @@ void Console::draw_status()
<< std::setw(2) << " ";
// uptime
- // FIXME this is plain wrong, but the timing routines need to be refactored first
float uptime = core::game()->time();
const int uptime_days = (int) floorf(uptime / (24.0f * 3600.0f));
diff --git a/src/dedicated/dedicated.cc b/src/dedicated/dedicated.cc
index 3d763f4..f93b5fa 100644
--- a/src/dedicated/dedicated.cc
+++ b/src/dedicated/dedicated.cc
@@ -10,7 +10,6 @@
#include "core/core.h"
#include "core/cvar.h"
#include "core/stats.h"
-#include "core/timer.h"
#include "dedicated/console.h"
#include "dedicated/dedicated.h"
@@ -52,11 +51,8 @@ void Dedicated::init(int count, char **arguments)
void Dedicated::run()
{
- core::Timer timer;
- timer.mark();
-
while (connected()) {
- frame(timer.timestamp());
+ frame();
#ifdef HAVE_CURSES
console()->frame();
#endif