From: LMH <lmh.0013@gmail.com>
Date: Fri, 19 Jul 2013 20:14:49 +0000 (-1000)
Subject: Merge branch 'glow_effects'
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=d4020fbad1a693156ae5ad310fdcf0f90e3f315f;p=supertux.git

Merge branch 'glow_effects'
Several enhancements to make dark levels more viable by adding a glow to several objects.  Candles have additional functionality to allow for many custom ambient lighting effects.  An ice vulnerability is also added to flame badguys; in addition, a fire vulnerable and invulnerable version of flame is added.  Finally a spiky-like badguy, LiveFire, is added which offers a sleeping and dormant (does not wake) state as well.  The effects can be observed in the added test level: "Glow Effects Test".

TODO: LiveFire graphics, regular level(s) intoducing the effects, and the addition of new sprites for candles would be nice.
---

d4020fbad1a693156ae5ad310fdcf0f90e3f315f
diff --cc src/supertux/object_factory.cpp
index d08e1f768,052b700b9..91afa928b
--- a/src/supertux/object_factory.cpp
+++ b/src/supertux/object_factory.cpp
@@@ -36,9 -36,10 +36,11 @@@
  #include "badguy/fish.hpp"
  #include "badguy/flame.hpp"
  #include "badguy/flyingsnowball.hpp"
+ #include "badguy/ghostflame.hpp"
  #include "badguy/ghosttree.hpp"
 +#include "badguy/goldbomb.hpp"
  #include "badguy/haywire.hpp"
+ #include "badguy/iceflame.hpp"
  #include "badguy/igel.hpp"
  #include "badguy/jumpy.hpp"
  #include "badguy/kamikazesnowball.hpp"
@@@ -189,9 -189,10 +192,11 @@@ ObjectFactory::init_factories(
    add_factory<Fish>("fish");
    add_factory<Flame>("flame");
    add_factory<FlyingSnowBall>("flyingsnowball");
+   add_factory<Ghostflame>("ghostflame");
    add_factory<GhostTree>("ghosttree");
 +  add_factory<GoldBomb>("goldbomb");
    add_factory<Haywire>("haywire");
+   add_factory<Iceflame>("iceflame");
    add_factory<Igel>("igel");
    add_factory<Jumpy>("jumpy");
    add_factory<KamikazeSnowball>("kamikazesnowball");