Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/model/mapfile.cc')
-rw-r--r--src/model/mapfile.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/model/mapfile.cc b/src/model/mapfile.cc
index f8e541c..84fd108 100644
--- a/src/model/mapfile.cc
+++ b/src/model/mapfile.cc
@@ -811,8 +811,7 @@ bool MapFile::got_key_axis(math::Axis &axis)
axis.assign(yaw, pitch, roll);
} else {
unknown_value();
- }
-
+ }
return true;
} else if (got_key_float("pitch", pitch)) {
@@ -1111,7 +1110,7 @@ Model * MapFile::load(std::string const &name)
continue;
} else if (mapfile.got_key_color("_color", color)) {
- tag_light->get_color().assign(color);
+ tag_light->set_color(color);
continue;
} else if (mapfile.got_key_int("spawnflags", u)) {
@@ -1167,7 +1166,7 @@ Model * MapFile::load(std::string const &name)
continue;
} else if (mapfile.got_key_color("_color", color)) {
- tag_flare->get_color().assign(color);
+ tag_flare->set_color(color);
continue;
} else if (mapfile.got_key_int("spawnflags", u)) {
@@ -1232,6 +1231,10 @@ Model * MapFile::load(std::string const &name)
tag_particles->get_location().assign(location * SCALE);
continue;
+ } else if (mapfile.got_key_color("_color", color)) {
+ tag_particles->set_color(color);
+ continue;
+
} else if (mapfile.got_key_string("script", str)) {
tag_particles->set_script(str);
continue;