projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed code that broke due to changes to Rectf and Sizef
[supertux.git]
/
src
/
object
/
trampoline.hpp
diff --git
a/src/object/trampoline.hpp
b/src/object/trampoline.hpp
index
27cea23
..
9f7fc77
100644
(file)
--- a/
src/object/trampoline.hpp
+++ b/
src/object/trampoline.hpp
@@
-26,6
+26,7
@@
class Trampoline : public Rock
{
public:
Trampoline(const Reader& reader);
{
public:
Trampoline(const Reader& reader);
+ Trampoline(const Vector& pos, bool port);
HitResponse collision(GameObject& other, const CollisionHit& hit);
void collision_solid(const CollisionHit& hit);
HitResponse collision(GameObject& other, const CollisionHit& hit);
void collision_solid(const CollisionHit& hit);