X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmoving_object.cpp;h=f71e909d0cb86c0ddf296101b9f39d2af978df37;hb=665b4a4a6b0edae82fb830528f16d2176da44aa4;hp=07be14103f6cd8ffb3e0d82b0ed6d087561624d4;hpb=8a627e73d824b5a14249cfe066dc2fdc643ce28d;p=supertux.git diff --git a/src/moving_object.cpp b/src/moving_object.cpp index 07be14103..f71e909d0 100644 --- a/src/moving_object.cpp +++ b/src/moving_object.cpp @@ -20,26 +20,9 @@ #include "moving_object.hpp" -MovingObject::MovingObject(std::string name) : - GameObject(name), bbox(0, 0, 0, 0), group(COLGROUP_MOVING), solid(false) -{ -} - -MovingObject::MovingObject(const lisp::Lisp& lisp) : - GameObject(lisp), bbox(0, 0, 0, 0), group(COLGROUP_MOVING) -{ - lisp.get("x", bbox.p1.x); - lisp.get("y", bbox.p1.y); - lisp.get("w", bbox.p2.x); - lisp.get("h", bbox.p2.y); - lisp.get("solid", solid); - bbox.p2.x+=bbox.p1.x; - bbox.p2.y+=bbox.p1.y; -} - -MovingObject::MovingObject(Rect bbox, CollisionGroup group, bool solid) : - bbox(bbox), group(group), solid(solid) +MovingObject::MovingObject() { + group = COLGROUP_MOVING; } MovingObject::~MovingObject()