Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2009-01-12 20:25:28 +0000
committerStijn Buys <ingar@osirion.org>2009-01-12 20:25:28 +0000
commit784e5c24d505aab001ae398cd53b039baed59f1f (patch)
tree5af692e35848cacff27c8ad529c4042b26b2d020 /src/model/map.cc
parentc55945a1e81f5e49ef706cb3d0d37f17dbb84709 (diff)
radius key for fx_particles, overrules the script value
Diffstat (limited to 'src/model/map.cc')
-rw-r--r--src/model/map.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/model/map.cc b/src/model/map.cc
index 955410f..a59d2ff 100644
--- a/src/model/map.cc
+++ b/src/model/map.cc
@@ -836,6 +836,7 @@ Model * Map::load(std::string const &name)
unsigned int u;
float angle;
+ float r;
while (mapfile.getline()) {
@@ -1094,10 +1095,10 @@ Model * Map::load(std::string const &name)
} else if (mapfile.got_key_int("spawnflags", u)) {
particles->particles_entity = spawnflag_isset(u, 2);
particles->particles_engine = spawnflag_isset(u, 4);
-/*
- } else if (mapfile.got_key_float("radius", particles->particles_radius)) {
- particles->particles_radius *= LIGHTSCALE;
-*/
+
+ } else if (mapfile.got_key_float("radius", r)) {
+ particles->set_radius(r * LIGHTSCALE);
+
} else if (mapfile.got_key()) {
mapfile.unknown_key();
}