diff options
| author | Stijn Buys <ingar@osirion.org> | 2013-01-21 20:13:08 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2013-01-21 20:13:08 +0000 |
| commit | b887a9f9de76df999a40f2ae8994984723ac46bf (patch) | |
| tree | 5e6a7a1cb0f00cfc298a029971ca717f543a2560 /src/render/particlesystemscript.cc | |
| parent | 266d0d2cf6648509650bdd490c8e9c64be75b92e (diff) | |
Renamed particle ejector types,
added random rotation to sprites.
Diffstat (limited to 'src/render/particlesystemscript.cc')
| -rw-r--r-- | src/render/particlesystemscript.cc | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/src/render/particlesystemscript.cc b/src/render/particlesystemscript.cc index 866fce1..ff75093 100644 --- a/src/render/particlesystemscript.cc +++ b/src/render/particlesystemscript.cc @@ -26,21 +26,18 @@ void ParticleSystemScript::list() const ParticleEjectorScript *ejector = (*eit); switch (ejector->type()) { - case ParticleEjectorScript::Flame: - strval.append(" flame"); + case ParticleEjectorScript::Sprite: + strval.append(" sprite"); break; case ParticleEjectorScript::Flare: strval.append(" flare"); break; - case ParticleEjectorScript::Jet: - strval.append(" jet"); - break; - case ParticleEjectorScript::Spray: - strval.append(" spray"); - break; case ParticleEjectorScript::Trail: strval.append(" trail"); break; + case ParticleEjectorScript::Flame: + strval.append(" flame"); + break; } } con_print << " " << script->label() << strval << " " << script->script_ejectors.size() << " " << aux::plural("ejector", script->script_ejectors.size()) << std::endl; @@ -119,16 +116,14 @@ ParticleSystemScript *ParticleSystemScript::load(const std::string &label) if (inifile.got_key_string("type", strval)) { aux::to_label(strval); - if (strval.compare("jet") == 0) { - ejector->set_type(ParticleEjectorScript::Jet); + if (strval.compare("sprite") == 0) { + ejector->set_type(ParticleEjectorScript::Sprite); + } else if (strval.compare("flare") == 0) { + ejector->set_type(ParticleEjectorScript::Flare); } else if (strval.compare("trail") == 0) { ejector->set_type(ParticleEjectorScript::Trail); } else if (strval.compare("flame") == 0) { ejector->set_type(ParticleEjectorScript::Flame); - } else if (strval.compare("spray") == 0) { - ejector->set_type(ParticleEjectorScript::Spray); - } else if (strval.compare("flare") == 0) { - ejector->set_type(ParticleEjectorScript::Flare); } else { inifile.unknown_value(); } @@ -271,21 +266,18 @@ ParticleSystemScript *ParticleSystemScript::load(const std::string &label) const ParticleEjectorScript *ejector = (*eit); switch (ejector->type()) { - case ParticleEjectorScript::Flame: - strval.append(" flame"); + case ParticleEjectorScript::Sprite: + strval.append(" sprite"); break; case ParticleEjectorScript::Flare: strval.append(" flare"); break; - case ParticleEjectorScript::Jet: - strval.append(" jet"); - break; - case ParticleEjectorScript::Spray: - strval.append(" spray"); - break; case ParticleEjectorScript::Trail: strval.append(" trail"); break; + case ParticleEjectorScript::Flame: + strval.append(" flame"); + break; } } con_debug << " " << script->label() << strval << " " << script->script_ejectors.size() << " " << aux::plural("ejector", script->script_ejectors.size()) << std::endl; |