Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-11-24 20:21:42 +0000
committerStijn Buys <ingar@osirion.org>2010-11-24 20:21:42 +0000
commit0f0b8b91ac6b4c6bce83c0d7c7586724b1528668 (patch)
tree81fa167b8376a3b92532e6379977dc3cc09fb28c /src/game
parent9623feb8667b9aa5a47343a13d5b9acb2312cbf8 (diff)
Added support for generic [entity] sections to intro.ini.
Diffstat (limited to 'src/game')
-rw-r--r--src/game/intro/intro.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/game/intro/intro.cc b/src/game/intro/intro.cc
index 2147d02..cd77388 100644
--- a/src/game/intro/intro.cc
+++ b/src/game/intro/intro.cc
@@ -50,6 +50,7 @@ bool Intro::load_world()
std::string strval;
core::EntityGlobe *globe = 0;
+ core::Entity *entity = 0;
math::Color color;
math::Vector3f v;
float f;
@@ -65,6 +66,11 @@ bool Intro::load_world()
zone->set_sky("sky");
core::Zone::add(zone);
+ } else if (ini.got_section("entity")) {
+ if (zone) {
+ entity = new core::Entity();
+ }
+
} else if (ini.got_section("convoy")) {
if (zone) {
convoy = new Convoy(zone);
@@ -93,6 +99,14 @@ bool Intro::load_world()
ini.unkown_key();
}
+ } else if (ini.in_section("entity")) {
+
+ if (core::Parser::got_entity_key(ini, entity)) {
+ continue;
+ } else {
+ ini.unkown_key();
+ }
+
} else if (ini.in_section("convoy")) {
if (ini.got_key_string("label", strval)) {