projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EnableKeyRepeat while console is open.
[supertux.git]
/
src
/
object
/
oneup.cpp
diff --git
a/src/object/oneup.cpp
b/src/object/oneup.cpp
index
25d6b5e
..
d449daf
100644
(file)
--- a/
src/object/oneup.cpp
+++ b/
src/object/oneup.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,11
+12,11
@@
// 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 "oneup.hpp"
#include <config.h>
#include "oneup.hpp"
@@
-24,21
+24,12
@@
#include "player.hpp"
#include "player_status.hpp"
#include "sector.hpp"
#include "player.hpp"
#include "player_status.hpp"
#include "sector.hpp"
-#include "sprite/sprite_manager.hpp"
#include "video/drawing_context.hpp"
OneUp::OneUp(const Vector& pos)
#include "video/drawing_context.hpp"
OneUp::OneUp(const Vector& pos)
+ : MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE)
{
{
- bbox.set_pos(pos);
- bbox.set_size(32, 32);
- sprite = sprite_manager->create("images/powerups/1up/1up.sprite");
physic.set_velocity(100, 400);
physic.set_velocity(100, 400);
- set_group(COLGROUP_TOUCHABLE);
-}
-
-OneUp::~OneUp()
-{
- delete sprite;
}
void
}
void
@@
-50,18
+41,12
@@
OneUp::update(float elapsed_time)
movement = physic.get_movement(elapsed_time);
}
movement = physic.get_movement(elapsed_time);
}
-void
-OneUp::draw(DrawingContext& context)
-{
- sprite->draw(context, get_pos(), LAYER_OBJECTS);
-}
-
HitResponse
OneUp::collision(GameObject& other, const CollisionHit& )
{
Player* player = dynamic_cast<Player*> (&other);
if(player) {
HitResponse
OneUp::collision(GameObject& other, const CollisionHit& )
{
Player* player = dynamic_cast<Player*> (&other);
if(player) {
- player->get_status()->
incLives(
);
+ player->get_status()->
add_coins(100
);
remove_me();
return ABORT_MOVE;
}
remove_me();
return ABORT_MOVE;
}