Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/intro/intro.cc')
-rw-r--r--src/game/intro/intro.cc21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/game/intro/intro.cc b/src/game/intro/intro.cc
index 05dcec7..f2da493 100644
--- a/src/game/intro/intro.cc
+++ b/src/game/intro/intro.cc
@@ -1,7 +1,7 @@
/*
intro/intro.cc
- This file is part of the Osirion project and is distributed under
- the terms of the GNU General Public License version 2
+ This file is part of the Osirion project and is distributed under
+ the terms of the GNU General Public License version 2
*/
#include "intro/intro.h"
@@ -12,7 +12,8 @@
#include "math/color.h"
#include "sys/sys.h"
-namespace intro {
+namespace intro
+{
core::Module *factory()
{
@@ -53,7 +54,7 @@ bool Intro::load_world()
math::Vector3f v;
float f;
bool b;
-
+
while (ini.getline()) {
if (ini.got_section()) {
@@ -63,18 +64,18 @@ bool Intro::load_world()
zone->set_name("Introduction");
zone->set_sky("sky");
core::Zone::add(zone);
-
+
} else if (ini.got_section("convoy")) {
if (zone) {
convoy = new Convoy(zone);
}
-
+
} else if (ini.got_section("globe")) {
if (zone) {
globe = new core::EntityGlobe();
globe->set_zone(zone);
}
-
+
} else {
ini.unknown_section();
}
@@ -84,7 +85,7 @@ bool Intro::load_world()
if (ini.got_key_string("label", strval)) {
zone->set_label(strval);
-
+
} else if (ini.got_key_string("sky", strval)) {
zone->set_sky(strval);
@@ -128,7 +129,9 @@ bool Intro::load_world()
} else if (ini.got_key_float("rotationspeed", globe->entity_rotationspeed)) {
continue;
} else if (ini.got_key_bool("bright", b)) {
- if (b) { globe->set_flag(core::Entity::Bright); }
+ if (b) {
+ globe->set_flag(core::Entity::Bright);
+ }
} else if (ini.got_key()) {
ini.unkown_key();
}