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-11-09 21:45:18 +0000
committerStijn Buys <ingar@osirion.org>2008-11-09 21:45:18 +0000
commita1eb1b4dc4d81df724ee43fc4e895dd22e81760f (patch)
tree5d53a557540147e1e981c5cd3c6be8ccc8448381 /src/game/game.cc
parent568e868ef43cc79ad277ec5ab2c3e08647725131 (diff)
working jumpgates
Diffstat (limited to 'src/game/game.cc')
-rw-r--r--src/game/game.cc16
1 files changed, 5 insertions, 11 deletions
diff --git a/src/game/game.cc b/src/game/game.cc
index 01a2574..a125eb7 100644
--- a/src/game/game.cc
+++ b/src/game/game.cc
@@ -4,25 +4,21 @@
the terms of the GNU General Public License version 2
*/
-#include "game/game.h"
-
-#include "base/base.h"
-#include "example/example.h"
-#include "intro/intro.h"
#include "core/core.h"
+#include "game/game.h"
+#include "game/base/game.h"
+#include "game/example/example.h"
+#include "game/intro/intro.h"
#include "sys/sys.h"
-namespace game
-{
-
/// register game modules
void register_modules(bool register_noninteractive_modules)
{
con_print << "^BRegistering game modules..." << std::endl;
// non-interactive modules
- core::Module::add(new base::Base());
+ core::Module::add(new game::Game());
core::Module::add(new example::Example());
// interactive modules
@@ -30,5 +26,3 @@ void register_modules(bool register_noninteractive_modules)
core::Module::add(new intro::Intro());
}
}
-
-}