Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/base/jumppoint.cc2
-rw-r--r--src/game/game.cc7
-rw-r--r--src/game/game.h2
-rw-r--r--src/game/intro/intro.cc4
4 files changed, 11 insertions, 4 deletions
diff --git a/src/game/base/jumppoint.cc b/src/game/base/jumppoint.cc
index bcaf8c5..da221cf 100644
--- a/src/game/base/jumppoint.cc
+++ b/src/game/base/jumppoint.cc
@@ -10,7 +10,7 @@
namespace base
{
-JumpPoint::JumpPoint() : core::Entity(core::Entity::Static)
+JumpPoint::JumpPoint() : core::Entity(core::Entity::Static | core::Entity::Bright)
{
entity_shape = core::Entity::Diamond;
entity_color.assign(0.0f, 0.8f, 0.8f, 1.0f);
diff --git a/src/game/game.cc b/src/game/game.cc
index 5e7c826..7e89a0d 100644
--- a/src/game/game.cc
+++ b/src/game/game.cc
@@ -14,12 +14,15 @@ namespace game
{
/// register game modules
-void register_modules(bool register_client_modules)
+void register_modules(bool register_noninteractive_modules)
{
con_print << "^BRegistering game modules..." << std::endl;
+
+ // non-interactive modules
core::Module::add("base", new base::Base());
- if (register_client_modules) {
+ // interactive modules
+ if (register_noninteractive_modules) {
core::Module::add("intro", new intro::Intro());
}
}
diff --git a/src/game/game.h b/src/game/game.h
index 544f26b..236299b 100644
--- a/src/game/game.h
+++ b/src/game/game.h
@@ -9,7 +9,7 @@
namespace game {
- void register_modules(bool register_client_modules=false);
+ void register_modules(bool register_noninteractive_modules=false);
}
#endif // __INCLUDED_GAME_H__
diff --git a/src/game/intro/intro.cc b/src/game/intro/intro.cc
index f5b4e2f..4ad183f 100644
--- a/src/game/intro/intro.cc
+++ b/src/game/intro/intro.cc
@@ -16,6 +16,7 @@ namespace intro {
Intro::Intro() : core::Module("Introduction")
{
+ module_interactive = false;
intro_zone = 0;
intro_convoy = 0;
}
@@ -95,6 +96,9 @@ bool Intro::load_world()
} else if (ini.got_section("intro")) {
continue;
+ } else if (ini.got_section("convoy")) {
+ continue;
+
} else if (ini.got_section("globe")) {
globe = new core::EntityGlobe();
globe->set_zone(intro_zone);