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
/
rock.hpp
diff --git
a/src/object/rock.hpp
b/src/object/rock.hpp
index
8ce1cb4
..
86a8e0e
100644
(file)
--- a/
src/object/rock.hpp
+++ b/
src/object/rock.hpp
@@
-28,10
+28,12
@@
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:
{
public:
+ Rock(const Vector& pos, std::string spritename);
Rock(const lisp::Lisp& reader);
Rock(const lisp::Lisp& reader);
+ Rock(const lisp::Lisp& reader, std::string spritename);
virtual Rock* clone() const { return new Rock(*this); }
void collision_solid(const CollisionHit& hit);
virtual Rock* clone() const { return new Rock(*this); }
void collision_solid(const CollisionHit& hit);
@@
-42,10
+44,10
@@
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
;
};
#endif
};
#endif