diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-11-18 19:21:57 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-11-18 19:21:57 +0000 |
| commit | a3b3dbf3ced35ae4c0aca148d89509a12f785062 (patch) | |
| tree | 6fc93069f70eb6059d056a00790be818df2c2f9f /src/model/tags.cc | |
| parent | 138dbc83d5720c8baa7270ece183ce356f619fce (diff) | |
Corrected default light and flare radius.
Suppoort for entity, engine and color keys in fx_particles and particle scripts.
Have light, fx_flare and fx_particles color override engine color if the engine spawnflag is set.
Diffstat (limited to 'src/model/tags.cc')
| -rw-r--r-- | src/model/tags.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/model/tags.cc b/src/model/tags.cc index c1467a1..5993f99 100644 --- a/src/model/tags.cc +++ b/src/model/tags.cc @@ -4,6 +4,7 @@ the terms of the GNU General Public License version 2 */ +#include "model/model.h" #include "model/tags.h" namespace model @@ -32,8 +33,9 @@ Light::Light() : light_entity = false; light_engine = false; light_strobe = false; + light_has_color = false; - light_radius = 1.0f; + light_radius = 100.0f * SCALE; light_frequency = 1.0f; light_offset = 0.0f; light_time = 0.5f; @@ -50,6 +52,7 @@ Light::Light(const Light& other) : light_entity = other.entity(); light_engine = other.engine(); light_strobe = other.strobe(); + light_has_color = other.has_color(); light_radius = other.radius(); light_frequency = other.frequency(); @@ -93,6 +96,7 @@ Particles::Particles() : { particles_entity = false; particles_engine = false; + particles_has_color = false; particles_scale = 1.0f; particles_cull = CullNone; } @@ -106,6 +110,7 @@ Particles::Particles(const Particles & other) : particles_engine = other.engine(); particles_scale = other.scale(); particles_cull = other.cull(); + particles_has_color = other.has_color(); } Particles::~Particles() |