X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmoving_object.hpp;h=22a8c3e9cf9dd916248a74b34a416b16830faefd;hb=a113d3bd1feddd510e3b2852b0d42522735eee40;hp=46abffbbeb14430a9b4f0a5f4f5ef7c4d2488009;hpb=ff4c6994b952e26b854461d739eb3bcbfc30719f;p=supertux.git diff --git a/src/moving_object.hpp b/src/moving_object.hpp index 46abffbbe..22a8c3e9c 100644 --- a/src/moving_object.hpp +++ b/src/moving_object.hpp @@ -63,7 +63,7 @@ enum CollisionGroup { * coins */ COLGROUP_TOUCHABLE, - + /** * Should be used for tilemaps */ @@ -92,23 +92,23 @@ public: { (void) tile_attributes; } - + const Vector& get_pos() const { return bbox.p1; } - + /** returns the bounding box of the Object */ const Rect& get_bbox() const { return bbox; } - + const Vector& get_movement() const { return movement; } - + /** places the moving object at a specific position. Be carefull when * using this function. There are no collision detection checks performed * here so bad things could happen. @@ -150,12 +150,12 @@ public: { this->group = group; } - + protected: friend class Sector; friend class CollisionGrid; friend class Platform; - + /** The bounding box of the object (as used for collision detection, this * isn't necessarily the bounding box for graphics) */