diff options
author | Stijn Buys <ingar@osirion.org> | 2008-09-27 17:16:15 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-09-27 17:16:15 +0000 |
commit | ca0c1d3e6f8b5fa4eb2e0a86fcf47b12fb600786 (patch) | |
tree | 5d72e330f11350065806e83cc8712693241b9aad /src/game/game.h | |
parent | 29984680d6e0e52efec489497b1796e056164442 (diff) |
mission targets, texture unloading, private messages
Diffstat (limited to 'src/game/game.h')
-rw-r--r-- | src/game/game.h | 12 |
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); |