#include <config.h>
#include <math.h>
-#include "flower.h"
-#include "resources.h"
-#include "camera.h"
-#include "sector.h"
-#include "player.h"
-#include "sprite/sprite_manager.h"
+#include "flower.hpp"
+#include "resources.hpp"
+#include "camera.hpp"
+#include "sector.hpp"
+#include "player.hpp"
+#include "audio/sound_manager.hpp"
+#include "sprite/sprite_manager.hpp"
-Flower::Flower(const Vector& pos, Type _type)
+Flower::Flower(Type _type)
: type(_type)
{
- bbox.set_pos(pos);
bbox.set_size(32, 32);
if(_type == FIREFLOWER)
- sprite = sprite_manager->create("fireflower");
+ sprite = sprite_manager->create("images/powerups/fireflower/fireflower.sprite");
else
- sprite = sprite_manager->create("iceflower");
+ sprite = sprite_manager->create("images/powerups/iceflower/iceflower.sprite");
+
+ set_group(COLGROUP_TOUCHABLE);
}
Flower::~Flower()
else
player->set_bonus(ICE_BONUS, true);
- sound_manager->play_sound("fire-flower");
+ sound_manager->play("sounds/fire-flower.wav");
remove_me();
return ABORT_MOVE;
}