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.h')
-rw-r--r--src/game/game.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/game/game.h b/src/game/game.h
index c7ec040..3b65da1 100644
--- a/src/game/game.h
+++ b/src/game/game.h
@@ -7,16 +7,15 @@
#ifndef __INCLUDED_GAME_H__
#define __INCLUDED_GAME_H__
-// project headers
+#include <vector>
+#include <string>
+
+#include "filesystem/inifile.h"
#include "game/ship.h"
#include "game/star.h"
#include "core/core.h"
#include "sys/sys.h"
-// C++ headers
-#include <vector>
-#include <string>
-
/// the game-specific engine
/** The main game functions.
*/
@@ -55,10 +54,13 @@ public:
core::Cvar *g_impulsespeed;
core::Cvar *g_impulseacceleration;
core::Cvar *g_strafespeed;
+ core::Cvar *g_jumppointrange;
core::Cvar *g_devel;
private:
+ bool got_entity_key(filesystem::IniFile &inifile, core::Entity *entity);
+
bool load_world();
bool load_zone(core::Zone *zone);