Improved iceflame graphics

diff --git a/data/images/creatures/flame/iceflame-0.png b/data/images/creatures/flame/iceflame-0.png
deleted file mode 100644 (file)
index 639e23d..0000000
Binary files a/data/images/creatures/flame/iceflame-0.png and /dev/null differ

diff --git a/data/images/creatures/flame/iceflame-1.png b/data/images/creatures/flame/iceflame-1.png
deleted file mode 100644 (file)
index 71cda2a..0000000
Binary files a/data/images/creatures/flame/iceflame-1.png and /dev/null differ

diff --git a/data/images/creatures/flame/iceflame-2.png b/data/images/creatures/flame/iceflame-2.png
deleted file mode 100644 (file)
index 23c0570..0000000
Binary files a/data/images/creatures/flame/iceflame-2.png and /dev/null differ

diff --git a/data/images/creatures/flame/iceflame-3.png b/data/images/creatures/flame/iceflame-3.png
deleted file mode 100644 (file)
index c2b185d..0000000
Binary files a/data/images/creatures/flame/iceflame-3.png and /dev/null differ

diff --git a/data/images/creatures/flame/iceflame-4.png b/data/images/creatures/flame/iceflame-4.png
deleted file mode 100644 (file)
index 2a4243c..0000000
Binary files a/data/images/creatures/flame/iceflame-4.png and /dev/null differ

diff --git a/data/images/creatures/flame/iceflame-5.png b/data/images/creatures/flame/iceflame-5.png
deleted file mode 100644 (file)
index 4e7a49b..0000000
Binary files a/data/images/creatures/flame/iceflame-5.png and /dev/null differ

diff --git a/data/images/creatures/flame/iceflame-editor.png b/data/images/creatures/flame/iceflame-editor.png
index 24120c0..235e98b 100644 (file)
Binary files a/data/images/creatures/flame/iceflame-editor.png and b/data/images/creatures/flame/iceflame-editor.png differ

diff --git a/data/images/creatures/flame/iceflame-fade-0.png b/data/images/creatures/flame/iceflame-fade-0.png
index 0ebf65d..22b5608 100644 (file)
Binary files a/data/images/creatures/flame/iceflame-fade-0.png and b/data/images/creatures/flame/iceflame-fade-0.png differ

diff --git a/data/images/creatures/flame/iceflame-fade-1.png b/data/images/creatures/flame/iceflame-fade-1.png
index fb1deaa..262b283 100644 (file)
Binary files a/data/images/creatures/flame/iceflame-fade-1.png and b/data/images/creatures/flame/iceflame-fade-1.png differ

diff --git a/data/images/creatures/flame/iceflame-fade-2.png b/data/images/creatures/flame/iceflame-fade-2.png
index 879d70f..bf132e1 100644 (file)
Binary files a/data/images/creatures/flame/iceflame-fade-2.png and b/data/images/creatures/flame/iceflame-fade-2.png differ

diff --git a/data/images/creatures/flame/iceflame-fade-3.png b/data/images/creatures/flame/iceflame-fade-3.png
deleted file mode 100644 (file)
index c161dc9..0000000
Binary files a/data/images/creatures/flame/iceflame-fade-3.png and /dev/null differ

diff --git a/data/images/creatures/flame/iceflame.png b/data/images/creatures/flame/iceflame.png
new file mode 100644 (file)
index 0000000..b48079b
Binary files /dev/null and b/data/images/creatures/flame/iceflame.png differ

diff --git a/data/images/creatures/flame/iceflame.sprite b/data/images/creatures/flame/iceflame.sprite
index 4416d76..1c02b68 100644 (file)
--- a/data/images/creatures/flame/iceflame.sprite
+++ b/data/images/creatures/flame/iceflame.sprite
@@ -1,23 +1,15 @@
 (supertux-sprite
-; these graphics could use some work
  (action
   (hitbox 0 0 31.8 31.8)
   (name "normal")
-  (images "iceflame-0.png"
-          "iceflame-1.png"
-          "iceflame-2.png"
-          "iceflame-3.png"
-          "iceflame-4.png"
-          "iceflame-5.png"))
+  (images "iceflame.png"))
  (action
   (hitbox 0 0 31.8 31.8)
   (name "fade")
   (fps 5)
-  (images "iceflame-1.png"
-          "iceflame-fade-0.png"
+  (images "iceflame-fade-0.png"
           "iceflame-fade-1.png"
-          "iceflame-fade-2.png"
-          "iceflame-fade-3.png"))
+          "iceflame-fade-2.png"))
  (action
   (hitbox 96 96 127.8 31.8)
   (name "editor")

diff --git a/data/images/creatures/flame/iceflame.xcf b/data/images/creatures/flame/iceflame.xcf
deleted file mode 100644 (file)
index 98a8565..0000000
Binary files a/data/images/creatures/flame/iceflame.xcf and /dev/null differ

diff --git a/src/badguy/iceflame.cpp b/src/badguy/iceflame.cpp
index 24c3f99..1ab9b16 100644 (file)
--- a/src/badguy/iceflame.cpp
+++ b/src/badguy/iceflame.cpp
@@ -66,16 +66,18 @@ Iceflame::active_update(float elapsed_time)
 void
 Iceflame::draw(DrawingContext& context)
 {
+  context.push_target();
+  //Rotate the Sprite (3 rotations per revolution)
+  sprite->set_angle(angle * 360.0f / (2*M_PI) * 3);
   //Draw the Sprite.
   sprite->draw(context, get_pos(), LAYER_OBJECTS);
   //Draw the light if dark
   context.get_light( get_bbox().get_middle(), &light );
   if (light.blue + light.green < 2.0){
-    context.push_target();
     context.set_target(DrawingContext::LIGHTMAP);
     lightsprite->draw(context, get_bbox().get_middle(), 0);
-    context.pop_target();
   }
+  context.pop_target();
 }