projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix mkdir on win32
[supertux.git]
/
src
/
sector.h
diff --git
a/src/sector.h
b/src/sector.h
index
64e2b3d
..
c2a8f3c
100644
(file)
--- a/
src/sector.h
+++ b/
src/sector.h
@@
-27,16
+27,12
@@
#include "audio/musicref.h"
#include "video/drawing_context.h"
#include "audio/musicref.h"
#include "video/drawing_context.h"
-using namespace SuperTux;
-
-namespace SuperTux {
-class Rectangle;
-}
namespace lisp {
class Lisp;
class Writer;
}
namespace lisp {
class Lisp;
class Writer;
}
+class Rect;
class Sprite;
class GameObject;
class Player;
class Sprite;
class GameObject;
class Player;
@@
-90,7
+86,7
@@
public:
{ return name; }
/// tests if a given rectangle is inside the sector
{ return name; }
/// tests if a given rectangle is inside the sector
- bool inside(const Rect
angle
& rectangle) const;
+ bool inside(const Rect& rectangle) const;
void play_music(MusicType musictype);
MusicType get_music_type();
void play_music(MusicType musictype);
MusicType get_music_type();
@@
-144,7
+140,7
@@
public: // TODO make this private again
typedef std::vector<SpawnPoint*> SpawnPoints;
SpawnPoints spawnpoints;
typedef std::vector<SpawnPoint*> SpawnPoints;
SpawnPoints spawnpoints;
- Rect
angle
get_active_region();
+ Rect get_active_region();
private:
void fix_old_tiles();
private:
void fix_old_tiles();