Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-11-10 18:02:13 +0000
committerStijn Buys <ingar@osirion.org>2008-11-10 18:02:13 +0000
commit03d5bc014c0e815c6aaeec16d81e225e08732ab0 (patch)
tree05aa0464284059bdc05d96f3cc17e081a0da78ee /src/game/base/game.h
parenta1eb1b4dc4d81df724ee43fc4e895dd22e81760f (diff)
adds jumpgate, station, ship dealer
Diffstat (limited to 'src/game/base/game.h')
-rw-r--r--src/game/base/game.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/game/base/game.h b/src/game/base/game.h
index bc9d1f7..d4f0743 100644
--- a/src/game/base/game.h
+++ b/src/game/base/game.h
@@ -36,7 +36,7 @@ const unsigned int station_enttype = 262;
class Game : public core::Module {
public:
Game();
- ~Game();
+ virtual ~Game();
/// run one time frame
void frame(float seconds);
@@ -66,10 +66,10 @@ public:
protected:
/// initialize the game
- void init();
+ virtual void init();
/// shutdown the game
- void shutdown();
+ virtual void shutdown();
private:
@@ -79,6 +79,8 @@ private:
bool validate_zone(core::Zone *zone);
+ bool load_menus(core::Entity *entity, const std::string &menufilename);
+
bool load_ships();
static core::Zone *default_zone;
@@ -89,7 +91,6 @@ private:
static void func_list_ship(std::string const &args);
static void func_join(core::Player *player, std::string const &args);
static void func_spectate(core::Player *player, std::string const &args);
- static void func_buy(core::Player *player, std::string const &args);
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);