From db287e4a5133125bb6f25ba21ea97c47b19ac67f Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Sat, 18 Oct 2008 14:44:13 +0000
Subject: minor module updates
---
src/game/base/base.cc | 5 +++--
src/game/game.cc | 4 ++--
src/game/intro/intro.cc | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
(limited to 'src/game')
diff --git a/src/game/base/base.cc b/src/game/base/base.cc
index dee303b..f27d013 100644
--- a/src/game/base/base.cc
+++ b/src/game/base/base.cc
@@ -162,11 +162,11 @@ void func_impulse(core::Player *player, std::string const &args)
ship->impulse();
}
-/* ---- The Game class --------------------------------------------- */
+/* ---- class Base ------------------------------------------------ */
Base *Base::game_instance = 0;
-Base::Base() : core::Module("Project::OSiRiON")
+Base::Base() : core::Module("base", "Project::OSiRiON")
{
game_instance = this;
g_impulsespeed = 0;
@@ -216,6 +216,7 @@ void Base::init()
func = core::Func::add("list_ship", (core::FuncPtr) func_list_ship);
func->set_info("list ship statistics");
+ // add engine variables
g_impulsespeed = core::Cvar::get("g_impulsespeed", "15", core::Cvar::Game | core::Cvar::Archive);
g_impulsespeed->set_info("[float] speed of the impulse drive");
diff --git a/src/game/game.cc b/src/game/game.cc
index 7e89a0d..9f5b395 100644
--- a/src/game/game.cc
+++ b/src/game/game.cc
@@ -19,11 +19,11 @@ void register_modules(bool register_noninteractive_modules)
con_print << "^BRegistering game modules..." << std::endl;
// non-interactive modules
- core::Module::add("base", new base::Base());
+ core::Module::add(new base::Base());
// interactive modules
if (register_noninteractive_modules) {
- core::Module::add("intro", new intro::Intro());
+ core::Module::add(new intro::Intro());
}
}
diff --git a/src/game/intro/intro.cc b/src/game/intro/intro.cc
index 4eb9a10..abb3ba8 100644
--- a/src/game/intro/intro.cc
+++ b/src/game/intro/intro.cc
@@ -14,7 +14,7 @@
namespace intro {
-Intro::Intro() : core::Module("Introduction")
+Intro::Intro() : core::Module("intro", "Introduction")
{
module_interactive = false;
intro_zone = 0;
--
cgit v1.2.3