Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/main.cc')
-rw-r--r--src/server/main.cc35
1 files changed, 4 insertions, 31 deletions
diff --git a/src/server/main.cc b/src/server/main.cc
index ae74471..56b29a8 100644
--- a/src/server/main.cc
+++ b/src/server/main.cc
@@ -4,40 +4,13 @@
the terms and conditions of the GNU General Public License version 2
*/
-// project headers
-#include "common/common.h"
-#include "game/game.h"
-
-#include "timer.h"
-#include "console.h"
-
-#include <iostream>
-
-void quit(int status)
-{
- exit(status);
-}
+#include "server/server.h"
int main( int argc, char *argv[] )
{
- // initialize system console;
- server::Console serverconsole;
-
- const float server_framerate = 1.0f / 20.0f;
- server::Timer timer;
-
- // initialize game
- game::init();
- timer.mark();
+ server::init();
- while(game::initialized) {
- float elapsed = timer.elapsed();
- game::update(elapsed);
- timer.sleep(server_framerate - elapsed);
- timer.mark();
- }
- // shutdown
- game::shutdown();
+ server::run();
- quit(0);
+ server::shutdown();
}