Changed egg shadow draw layer so it will no longer appear in front of bonusblocks...

[supertux.git] / src / object / growup.cpp

diff --git a/src/object/growup.cpp b/src/object/growup.cpp
index 4e49494..37eda10 100644 (file)
--- a/src/object/growup.cpp
+++ b/src/object/growup.cpp
@@ -26,12 +26,12 @@ GrowUp::GrowUp(Direction direction) :
   MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING),
   physic(),
   light(0.0f,0.0f,0.0f),
-  shadesprite(sprite_manager->create("images/powerups/egg/egg.sprite")),
-  lightsprite(sprite_manager->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
+  shadesprite(SpriteManager::current()->create("images/powerups/egg/egg.sprite")),
+  lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
 {
   physic.enable_gravity(true);
   physic.set_velocity_x((direction == LEFT)?-100:100);
-  sound_manager->preload("sounds/grow.ogg");
+  SoundManager::current()->preload("sounds/grow.ogg");
   //shadow to remain in place as egg rolls
   shadesprite->set_action("shadow");
   //set light for glow effect
@@ -55,7 +55,7 @@ GrowUp::draw(DrawingContext& context)
   //Draw the Sprite.
   MovingSprite::draw(context);
   //Draw shade
-  shadesprite->draw(context, get_pos(), layer+1);
+  shadesprite->draw(context, get_pos(), layer);
   //Draw the light when dark
   context.get_light( get_bbox().get_middle(), &light );
   if (light.red + light.green < 2.0){
@@ -89,7 +89,7 @@ GrowUp::collision(GameObject& other, const CollisionHit& hit )
       return ABORT_MOVE;
     }
 
-    sound_manager->play("sounds/grow.ogg");
+    SoundManager::current()->play("sounds/grow.ogg");
     remove_me();
 
     return ABORT_MOVE;