Rolled file back to version from master, due to improper merge

[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);
+  Trampoline(const Vector& pos, bool port);
 
   HitResponse collision(GameObject& other, const CollisionHit& hit);
   void collision_solid(const CollisionHit& hit);