From: Mathnerd314 <mathnerd314.gph+hs@gmail.com>
Date: Sun, 3 Aug 2014 19:20:10 +0000 (+0200)
Subject: Fix egg sprite
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=675174190da18465c58778c946db8a183e0749dd;p=supertux.git

Fix egg sprite
---

diff --git a/data/images/powerups/egg/egg-0.png b/data/images/powerups/egg/egg-0.png
deleted file mode 100644
index 8d6105ff9..000000000
Binary files a/data/images/powerups/egg/egg-0.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-1.png b/data/images/powerups/egg/egg-1.png
deleted file mode 100644
index 863b78b81..000000000
Binary files a/data/images/powerups/egg/egg-1.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-10.png b/data/images/powerups/egg/egg-10.png
deleted file mode 100644
index cb804d733..000000000
Binary files a/data/images/powerups/egg/egg-10.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-11.png b/data/images/powerups/egg/egg-11.png
deleted file mode 100644
index 9e326b2d0..000000000
Binary files a/data/images/powerups/egg/egg-11.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-12.png b/data/images/powerups/egg/egg-12.png
deleted file mode 100644
index 1ee1f18dd..000000000
Binary files a/data/images/powerups/egg/egg-12.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-13.png b/data/images/powerups/egg/egg-13.png
deleted file mode 100644
index 2b5e0a53b..000000000
Binary files a/data/images/powerups/egg/egg-13.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-14.png b/data/images/powerups/egg/egg-14.png
deleted file mode 100644
index 707fc97d0..000000000
Binary files a/data/images/powerups/egg/egg-14.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-15.png b/data/images/powerups/egg/egg-15.png
deleted file mode 100644
index 37266c8b0..000000000
Binary files a/data/images/powerups/egg/egg-15.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-16.png b/data/images/powerups/egg/egg-16.png
deleted file mode 100644
index 9e24d1c10..000000000
Binary files a/data/images/powerups/egg/egg-16.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-17.png b/data/images/powerups/egg/egg-17.png
deleted file mode 100644
index a6193d40a..000000000
Binary files a/data/images/powerups/egg/egg-17.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-18.png b/data/images/powerups/egg/egg-18.png
deleted file mode 100644
index e0641398b..000000000
Binary files a/data/images/powerups/egg/egg-18.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-19.png b/data/images/powerups/egg/egg-19.png
deleted file mode 100644
index cd2e385a3..000000000
Binary files a/data/images/powerups/egg/egg-19.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-2.png b/data/images/powerups/egg/egg-2.png
deleted file mode 100644
index ed6b220cf..000000000
Binary files a/data/images/powerups/egg/egg-2.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-3.png b/data/images/powerups/egg/egg-3.png
deleted file mode 100644
index e0f4bbb02..000000000
Binary files a/data/images/powerups/egg/egg-3.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-4.png b/data/images/powerups/egg/egg-4.png
deleted file mode 100644
index e041ad7cd..000000000
Binary files a/data/images/powerups/egg/egg-4.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-5.png b/data/images/powerups/egg/egg-5.png
deleted file mode 100644
index 0fc79ce6e..000000000
Binary files a/data/images/powerups/egg/egg-5.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-6.png b/data/images/powerups/egg/egg-6.png
deleted file mode 100644
index fd2bfb349..000000000
Binary files a/data/images/powerups/egg/egg-6.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-7.png b/data/images/powerups/egg/egg-7.png
deleted file mode 100644
index d9426abcf..000000000
Binary files a/data/images/powerups/egg/egg-7.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-8.png b/data/images/powerups/egg/egg-8.png
deleted file mode 100644
index 9a7fc19cf..000000000
Binary files a/data/images/powerups/egg/egg-8.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg-9.png b/data/images/powerups/egg/egg-9.png
deleted file mode 100644
index ff38eafd1..000000000
Binary files a/data/images/powerups/egg/egg-9.png and /dev/null differ
diff --git a/data/images/powerups/egg/egg.png b/data/images/powerups/egg/egg.png
new file mode 100644
index 000000000..8d6105ff9
Binary files /dev/null and b/data/images/powerups/egg/egg.png differ
diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index eaafffe16..4e49494b4 100644
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -37,8 +37,6 @@ GrowUp::GrowUp(Direction direction) :
   //set light for glow effect
   lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
   lightsprite->set_color(Color(0.2f, 0.2f, 0.0f));
-  
-  sprite->set_action((direction == LEFT) ? "left" : "right");
 }
 
 void
@@ -77,12 +75,6 @@ GrowUp::collision_solid(const CollisionHit& hit)
     physic.set_velocity_y(0);
   if(hit.left || hit.right) {
     physic.set_velocity_x(-physic.get_velocity_x());
-    if(hit.left)
-      sprite->set_action("right");
-    else {
-      sprite->set_action("left");
-    }
-
   }
 }