game module cleanups

1 files changed, 20 insertions, 13 deletions

diff --git a/src/game/base/base.cc b/src/game/base/base.cc
index 530e520..738db04 100644
--- a/src/game/base/base.cc
+++ b/src/game/base/base.cc
@@ -25,10 +25,7 @@
 namespace base
 {
 
-ShipModel		*default_shipmodel = 0;
-core::Zone		*default_zone = 0;
-
-/*----- engine game functions ------------------------------------- */
+/* -- engine game functions ---------------------------------------- */
 
 /// list the ship model registry
 void func_list_ship(std::string const &args)
@@ -42,9 +39,9 @@ void func_join(core::Player *player, std::string const &args)
 	if (player->control())
 		return;
 
-	player->set_zone(default_zone);
-	Ship *ship = new Ship(player, default_shipmodel);
-	ship->set_zone(default_zone);
+	player->set_zone(Base::default_zone);
+	Ship *ship = new Ship(player, Base::default_shipmodel);
+	ship->set_zone(Base::default_zone);
 	player->set_control(ship);
 
 	core::server()->send_sound(player, "game/buy-ship");
@@ -105,7 +102,7 @@ void func_buy(core::Player *player, std::string const &args)
 		if (player->zone()) {
 			ship->set_zone(player->zone());
 		} else {
-			ship->set_zone(default_zone);
+			ship->set_zone(Base::default_zone);
 		}
 		player->set_control(ship);
 		
@@ -162,19 +159,29 @@ void func_impulse(core::Player *player, std::string const &args)
 	ship->impulse();
 }
 
-/* ---- class Base ------------------------------------------------ */
+/* -- class Base static members ----------------------------------- */
+
+// game variables
+core::Cvar *Base::g_impulsespeed = 0;
+core::Cvar *Base::g_impulseacceleration = 0;
+core::Cvar *Base::g_strafespeed = 0;
+core::Cvar *Base::g_jumppointrange = 0;
+core::Cvar *Base::g_devel = 0;
 
-Base 			*Base::game_instance = 0;
+// game defaults
+core::Zone		*Base::default_zone = 0;
+ShipModel		*Base::default_shipmodel = 0;
+
+/* -- class Base -------------------------------------------------- */
 
 Base::Base() : core::Module("base", "Project::OSiRiON", true)
 {
-	game_instance = this;
-	g_impulsespeed = 0;
+	default_shipmodel = 0;
+	default_zone = 0;
 }
 
 Base::~Base()
 {
-	game_instance = 0;
 }
 
 void Base::init()