diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
| commit | f030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch) | |
| tree | cd92baf9e4fa8a136523b9eb570e9811846c9250 /src/game/base/game.h | |
| parent | 5636fad174f0bcff857c357c394c4cc8d424b302 (diff) | |
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/game/base/game.h')
| -rw-r--r-- | src/game/base/game.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/game/base/game.h b/src/game/base/game.h index 9b2d377..65084d3 100644 --- a/src/game/base/game.h +++ b/src/game/base/game.h @@ -1,7 +1,7 @@ /* base/game.h - This file is part of the Osirion project and is distributed under - the terms of the GNU General Public License version 2 + This file is part of the Osirion project and is distributed under + the terms of the GNU General Public License version 2 */ #ifndef __INCLUDED_BASE_H__ @@ -35,7 +35,8 @@ const unsigned int jumpgate_enttype = 261; const unsigned int station_enttype = 262; /// default player settings -class Default { +class Default +{ public: static core::Zone *zone; static core::Entity *view; @@ -46,7 +47,8 @@ public: }; /// the base Project::OSiRiON game model -class Game : public core::Module { +class Game : public core::Module +{ public: Game(); virtual ~Game(); @@ -84,7 +86,7 @@ private: bool load_menus(core::Entity *entity, const std::string &menufilename); bool load_ships(); - + bool load_player(); /* ---- engine functions ----------------------------------- */ @@ -95,7 +97,7 @@ private: static void func_hail(core::Player *player, std::string const &args); static void func_jump(core::Player *player, std::string const &args); static void func_impulse(core::Player *player, std::string const &args); - static void func_dock(core::Player *player,core::Entity *entity); + static void func_dock(core::Player *player, core::Entity *entity); static void func_launch(core::Player *player, std::string const &args); static void func_respawn(core::Player *player, std::string const &args); static void func_goto(core::Player *player, const std::string &args); |