// $Id$
-//
+//
// SuperTux
-// Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
#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(Type _type)
: type(_type)
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()
return ABORT_MOVE;
if(type == FIREFLOWER)
- player->set_bonus(FIRE_BONUS, true);
+ player->add_bonus(FIRE_BONUS, true);
else
- player->set_bonus(ICE_BONUS, true);
+ player->add_bonus(ICE_BONUS, true);
- sound_manager->play_sound("fire-flower");
+ sound_manager->play("sounds/fire-flower.wav");
remove_me();
return ABORT_MOVE;
}