diff options
author | Stijn Buys <ingar@osirion.org> | 2015-01-25 11:18:18 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2015-01-25 11:18:18 +0000 |
commit | cd30cd33b8b78343f0edcc29ac07fa5bd1b844bd (patch) | |
tree | d03502f843d8d20045aa8cc9ab1f8d01a0984cdf /src/game/base/game.h | |
parent | e3986c6d4e898da80bafd21e3861119248a170d8 (diff) |
Minor header file cleanup,
add weapons to the player's ship when starting a new game.
Diffstat (limited to 'src/game/base/game.h')
-rw-r--r-- | src/game/base/game.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/game/base/game.h b/src/game/base/game.h index 76d7797..5a93272 100644 --- a/src/game/base/game.h +++ b/src/game/base/game.h @@ -10,9 +10,6 @@ #include <vector> #include <string> -#include "base/ship.h" -#include "base/faction.h" - #include "core/module.h" #include "core/range.h" #include "core/application.h" @@ -52,6 +49,9 @@ const float jump_timer_delay = 5.0f; const float jump_cooldown_delay = 2.0f; const float impulse_timer_delay = 3.0f; +class ShipModel; +class Weapon; + /// default player settings class Default { @@ -59,6 +59,8 @@ public: static core::Zone *zone; static core::Entity *view; static ShipModel *shipmodel; + static Weapon *cannonmodel; + static Weapon *turretmodel; static long credits; static void clear(); |