From 381c729e777b50771626703e60b422aafc791513 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Mon, 29 Sep 2008 18:01:35 +0000 Subject: adds introduction screen to the client --- src/game/base/jumppoint.cc | 2 +- src/game/game.cc | 7 +++++-- src/game/game.h | 2 +- src/game/intro/intro.cc | 4 ++++ 4 files changed, 11 insertions(+), 4 deletions(-) (limited to 'src/game') 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); -- cgit v1.2.3