X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fflower.cpp;h=4d3fade4a506504284af471b7657b157d20f75ef;hb=d097f456b8ab4f42058545bdd4f8f676d151e974;hp=eb54f9c2873a3a08fb88440bdfea7bded1619c17;hpb=30e7ce8e8812f75334733830748a59731d99bf3f;p=supertux.git

diff --git a/src/object/flower.cpp b/src/object/flower.cpp
index eb54f9c28..4d3fade4a 100644
--- a/src/object/flower.cpp
+++ b/src/object/flower.cpp
@@ -17,22 +17,38 @@
 #include "audio/sound_manager.hpp"
 #include "object/flower.hpp"
 #include "object/player.hpp"
+#include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
 
 Flower::Flower(BonusType _type) :
   type(_type),
   sprite(),
-  drawing_effect(NO_EFFECT)
+  drawing_effect(NO_EFFECT),
+  light(1.0f,1.0f,1.0f),
+  lightsprite(SpriteManager::current()->create("images/objects/lightmap_light/lightmap_light-small.sprite"))
 {
   bbox.set_size(32, 32);
+  lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
 
   if(type == FIRE_BONUS) {
-    sprite = sprite_manager->create("images/powerups/fireflower/fireflower.sprite");
-    sound_manager->preload("sounds/fire-flower.wav");
+    sprite = SpriteManager::current()->create("images/powerups/fireflower/fireflower.sprite");
+    SoundManager::current()->preload("sounds/fire-flower.wav");
+    lightsprite->set_color(Color(0.3f, 0.0f, 0.0f));
   }
   else if(type == ICE_BONUS) {
-    sprite = sprite_manager->create("images/powerups/iceflower/iceflower.sprite");
-    sound_manager->preload("sounds/fire-flower.wav");
+    sprite = SpriteManager::current()->create("images/powerups/iceflower/iceflower.sprite");
+    SoundManager::current()->preload("sounds/fire-flower.wav");
+    lightsprite->set_color(Color(0.0f, 0.1f, 0.2f));
+  }
+  else if(type == AIR_BONUS) {
+    sprite = SpriteManager::current()->create("images/powerups/airflower/airflower.sprite");
+    SoundManager::current()->preload("sounds/fire-flower.wav");
+    lightsprite->set_color(Color(0.15f, 0.0f, 0.15f));
+  }
+  else if(type == EARTH_BONUS) {
+    sprite = SpriteManager::current()->create("images/powerups/earthflower/earthflower.sprite");
+    SoundManager::current()->preload("sounds/fire-flower.wav");
+    lightsprite->set_color(Color(0.0f, 0.3f, 0.0f));
   } else {
     assert(false);
   }
@@ -52,7 +68,16 @@ Flower::update(float )
 void
 Flower::draw(DrawingContext& context)
 {
+  //Draw the Sprite.
   sprite->draw(context, get_pos(), LAYER_OBJECTS, drawing_effect);
+  //Draw the light when dark
+  context.get_light( get_bbox().get_middle(), &light );
+  if (light.red + light.green + light.blue < 3.0){
+    context.push_target();
+    context.set_target(DrawingContext::LIGHTMAP);
+    lightsprite->draw(context, get_bbox().get_middle(), 0);
+    context.pop_target();
+  }
 }
 
 HitResponse
@@ -65,7 +90,7 @@ Flower::collision(GameObject& other, const CollisionHit& )
   if(!player->add_bonus(type, true))
     return FORCE_MOVE;
 
-  sound_manager->play("sounds/fire-flower.wav");
+  SoundManager::current()->play("sounds/fire-flower.wav");
   remove_me();
   return ABORT_MOVE;
 }