X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.h;h=c2a8f3c474c952f8792123b0847176c026ac4645;hb=c62a9b627722f6371877c4dcbc218c60edb58559;hp=64e2b3d02aa044e7ae88e5e0b51950cfe521cefd;hpb=c0093d25093395cb62fc2526ab42be65a9f015b8;p=supertux.git diff --git a/src/sector.h b/src/sector.h index 64e2b3d02..c2a8f3c47 100644 --- a/src/sector.h +++ b/src/sector.h @@ -27,16 +27,12 @@ #include "audio/musicref.h" #include "video/drawing_context.h" -using namespace SuperTux; - -namespace SuperTux { -class Rectangle; -} namespace lisp { class Lisp; class Writer; } +class Rect; class Sprite; class GameObject; class Player; @@ -90,7 +86,7 @@ public: { return name; } /// tests if a given rectangle is inside the sector - bool inside(const Rectangle& rectangle) const; + bool inside(const Rect& rectangle) const; void play_music(MusicType musictype); MusicType get_music_type(); @@ -144,7 +140,7 @@ public: // TODO make this private again typedef std::vector SpawnPoints; SpawnPoints spawnpoints; - Rectangle get_active_region(); + Rect get_active_region(); private: void fix_old_tiles();