Fix egg sprite
authorMathnerd314 <mathnerd314.gph+hs@gmail.com>
Sun, 3 Aug 2014 19:20:10 +0000 (21:20 +0200)
committerMathnerd314 <mathnerd314.gph+hs@gmail.com>
Sun, 3 Aug 2014 19:21:06 +0000 (21:21 +0200)
22 files changed:
data/images/powerups/egg/egg-0.png [deleted file]
data/images/powerups/egg/egg-1.png [deleted file]
data/images/powerups/egg/egg-10.png [deleted file]
data/images/powerups/egg/egg-11.png [deleted file]
data/images/powerups/egg/egg-12.png [deleted file]
data/images/powerups/egg/egg-13.png [deleted file]
data/images/powerups/egg/egg-14.png [deleted file]
data/images/powerups/egg/egg-15.png [deleted file]
data/images/powerups/egg/egg-16.png [deleted file]
data/images/powerups/egg/egg-17.png [deleted file]
data/images/powerups/egg/egg-18.png [deleted file]
data/images/powerups/egg/egg-19.png [deleted file]
data/images/powerups/egg/egg-2.png [deleted file]
data/images/powerups/egg/egg-3.png [deleted file]
data/images/powerups/egg/egg-4.png [deleted file]
data/images/powerups/egg/egg-5.png [deleted file]
data/images/powerups/egg/egg-6.png [deleted file]
data/images/powerups/egg/egg-7.png [deleted file]
data/images/powerups/egg/egg-8.png [deleted file]
data/images/powerups/egg/egg-9.png [deleted file]
data/images/powerups/egg/egg.png [new file with mode: 0644]
src/object/growup.cpp

diff --git a/data/images/powerups/egg/egg-0.png b/data/images/powerups/egg/egg-0.png
deleted file mode 100644 (file)
index 8d6105f..0000000
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 (file)
index 863b78b..0000000
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 (file)
index cb804d7..0000000
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 (file)
index 9e326b2..0000000
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 (file)
index 1ee1f18..0000000
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 (file)
index 2b5e0a5..0000000
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 (file)
index 707fc97..0000000
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 (file)
index 37266c8..0000000
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 (file)
index 9e24d1c..0000000
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 (file)
index a6193d4..0000000
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 (file)
index e064139..0000000
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 (file)
index cd2e385..0000000
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 (file)
index ed6b220..0000000
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 (file)
index e0f4bbb..0000000
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 (file)
index e041ad7..0000000
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 (file)
index 0fc79ce..0000000
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 (file)
index fd2bfb3..0000000
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 (file)
index d9426ab..0000000
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 (file)
index 9a7fc19..0000000
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 (file)
index ff38eaf..0000000
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 (file)
index 0000000..8d6105f
Binary files /dev/null and b/data/images/powerups/egg/egg.png differ
index eaafffe..4e49494 100644 (file)
@@ -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");
-    }
-
   }
 }