Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/game.cc')
-rw-r--r--src/game/game.cc20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/game/game.cc b/src/game/game.cc
index e34a7b8..0ac9acc 100644
--- a/src/game/game.cc
+++ b/src/game/game.cc
@@ -1,34 +1,38 @@
-/* game.h
+/*
+ game/game.cc
This file is part of the Osirion project and is distributed under
the terms of the GNU General Public License version 2
*/
-
// project headers
#include "ship.h"
#include "star.h"
-#include "file.h"
+
+#include "common/file.h"
namespace game {
+using common::File;
+using common::Vector3f;
+
Ship ship;
Star star;
bool initialized = false;
// TODO datadir should by set by ./configure and read from config.h
// FIXME win32
-std::string datadir("./data/");
-std::string homedir("~/.osirion/");
-std::string basedir("base/");
-std::string moddir;
-
void init()
{
// load the world
star.location = Vector3f(256.0f, 0.0f, 256.0f);
ship.location = Vector3f(0,0,0);
+ // initialize game data locations
// TODO create game::homedir if it doesn't exist
+ File::datadir = "./data/";
+ File::homedir = "~/.osirion/";
+ File::basedir = "base/";
+ File::moddir = "";
// read game.ini
File f;