projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made buttjump a bit easier to perform
[supertux.git]
/
src
/
object
/
flower.cpp
diff --git
a/src/object/flower.cpp
b/src/object/flower.cpp
index
04623a9
..
71cacf2
100644
(file)
--- a/
src/object/flower.cpp
+++ b/
src/object/flower.cpp
@@
-1,7
+1,7
@@
// $Id$
// $Id$
-//
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
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
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,14
+12,15
@@
// 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.
// 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
// 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 <config.h>
#include <math.h>
+#include <assert.h>
#include "flower.hpp"
#include "resources.hpp"
#include "camera.hpp"
#include "flower.hpp"
#include "resources.hpp"
#include "camera.hpp"
@@
-28,15
+29,20
@@
#include "audio/sound_manager.hpp"
#include "sprite/sprite_manager.hpp"
#include "audio/sound_manager.hpp"
#include "sprite/sprite_manager.hpp"
-Flower::Flower(Type _type)
+Flower::Flower(
Bonus
Type _type)
: type(_type)
{
bbox.set_size(32, 32);
: type(_type)
{
bbox.set_size(32, 32);
- if(
_type == FIREFLOWER)
+ if(
type == FIRE_BONUS) {
sprite = sprite_manager->create("images/powerups/fireflower/fireflower.sprite");
sprite = sprite_manager->create("images/powerups/fireflower/fireflower.sprite");
- else
- sprite = sprite_manager->create("images/powerups/iceflower/iceflower.sprite");
+ sound_manager->preload("sounds/fire-flower.wav");
+ }
+ else if(type == ICE_BONUS) {
+ sprite = sprite_manager->create("images/powerups/iceflower/iceflower.sprite");
+ } else {
+ assert(false);
+ }
set_group(COLGROUP_TOUCHABLE);
}
set_group(COLGROUP_TOUCHABLE);
}
@@
-64,13
+70,10
@@
Flower::collision(GameObject& other, const CollisionHit& )
if(!player)
return ABORT_MOVE;
if(!player)
return ABORT_MOVE;
- if(type == FIREFLOWER)
- player->set_bonus(FIRE_BONUS, true);
- else
- player->set_bonus(ICE_BONUS, true);
-
+ if(!player->add_bonus(type, true))
+ return FORCE_MOVE;
+
sound_manager->play("sounds/fire-flower.wav");
remove_me();
return ABORT_MOVE;
}
sound_manager->play("sounds/fire-flower.wav");
remove_me();
return ABORT_MOVE;
}
-