projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged gravity patch by T. Goya
[supertux.git]
/
src
/
object
/
rock.hpp
diff --git
a/src/object/rock.hpp
b/src/object/rock.hpp
index
fb1fb0c
..
099d7ca
100644
(file)
--- a/
src/object/rock.hpp
+++ b/
src/object/rock.hpp
@@
-28,7
+28,7
@@
class Sprite;
class Sprite;
-class Rock : public MovingSprite, public Portable, public Serializable
+class Rock : public MovingSprite, public Portable, p
rotected UsesPhysic, p
ublic Serializable
{
public:
Rock(const lisp::Lisp& reader);
{
public:
Rock(const lisp::Lisp& reader);
@@
-43,10
+43,9
@@
public:
void grab(MovingObject& object, const Vector& pos, Direction dir);
void ungrab(MovingObject& object, Direction dir);
void grab(MovingObject& object, const Vector& pos, Direction dir);
void ungrab(MovingObject& object, Direction dir);
-pr
ivate
:
+pr
otected
:
bool on_ground;
bool grabbed;
bool on_ground;
bool grabbed;
- Physic physic;
Vector last_movement;
};
Vector last_movement;
};