projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix issue with action not being updated when typing grow()/fire()/etc in console...
[supertux.git]
/
src
/
object
/
block.hpp
diff --git
a/src/object/block.hpp
b/src/object/block.hpp
index
94f87fb
..
4f326eb
100644
(file)
--- a/
src/object/block.hpp
+++ b/
src/object/block.hpp
@@
-40,8
+40,8
@@
protected:
friend class FlipLevelTransformer;
virtual void hit(Player& player) = 0;
friend class FlipLevelTransformer;
virtual void hit(Player& player) = 0;
- void start_bounce();
- void start_break();
+ void start_bounce(
GameObject* hitter
);
+ void start_break(
GameObject* hitter
);
void break_me();
Sprite* sprite;
void break_me();
Sprite* sprite;
@@
-85,7
+85,7
@@
class Brick : public Block
public:
Brick(const Vector& pos, int data);
public:
Brick(const Vector& pos, int data);
- void try_break(
bool playerhit
= false);
+ void try_break(
Player* player
= false);
HitResponse collision(GameObject& other, const CollisionHit& hit);
protected:
HitResponse collision(GameObject& other, const CollisionHit& hit);
protected: