projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-Worldmap cleanups (use DrawingContext transformstack)
[supertux.git]
/
src
/
object
/
oneup.cpp
diff --git
a/src/object/oneup.cpp
b/src/object/oneup.cpp
index
a576bcf
..
313efdf
100644
(file)
--- a/
src/object/oneup.cpp
+++ b/
src/object/oneup.cpp
@@
-3,7
+3,7
@@
#include "oneup.h"
#include "resources.h"
#include "player.h"
#include "oneup.h"
#include "resources.h"
#include "player.h"
-#include "
scene
.h"
+#include "
player_status
.h"
#include "sector.h"
#include "special/sprite_manager.h"
#include "video/drawing_context.h"
#include "sector.h"
#include "special/sprite_manager.h"
#include "video/drawing_context.h"
@@
-41,7
+41,7
@@
OneUp::collision(GameObject& other, const CollisionHit& )
{
Player* player = dynamic_cast<Player*> (&other);
if(player) {
{
Player* player = dynamic_cast<Player*> (&other);
if(player) {
- player->get_status()
.
incLives();
+ player->get_status()
->
incLives();
remove_me();
return ABORT_MOVE;
}
remove_me();
return ABORT_MOVE;
}