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-08-15 16:07:58 +0000
committerStijn Buys <ingar@osirion.org>2008-08-15 16:07:58 +0000
commitfa589fafa7f094bc1bf07642b55f3d824814adba (patch)
treedc1b96685c4d92cd838551ee14ce02a7f81eb5bf /src/server/server.cc
parentb780874cf4ab23cf9e48aa23da2394169da24887 (diff)
moved Timer to core::
Diffstat (limited to 'src/server/server.cc')
-rw-r--r--src/server/server.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/server.cc b/src/server/server.cc
index fce2181..27cf6bd 100644
--- a/src/server/server.cc
+++ b/src/server/server.cc
@@ -9,9 +9,9 @@
#include "core/core.h"
#include "core/stats.h"
+#include "core/timer.h"
#include "server/console.h"
#include "server/server.h"
-#include "server/timer.h"
namespace server {
@@ -77,7 +77,7 @@ void Server::run()
if (core::Cvar::sv_framerate->value())
server_framerate = 1.0f / core::Cvar::sv_framerate->value();
- server::Timer timer;
+ core::Timer timer;
float elapsed = 0;
while(connected()) {