projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
create lisp code on the fly (still no enemies showing up in editor, no idea why....
[supertux.git]
/
src
/
sector.h
diff --git
a/src/sector.h
b/src/sector.h
index
ee08514
..
5f31dc9
100644
(file)
--- a/
src/sector.h
+++ b/
src/sector.h
@@
-40,19
+40,11
@@
class Lisp;
class Writer;
}
class Writer;
}
-class InteractiveObject;
-class Background;
class Player;
class Camera;
class Player;
class Camera;
-class Trampoline;
-class FlyingPlatform;
class TileMap;
class TileMap;
-class Upgrade;
class Bullet;
class Bullet;
-class SmokeCloud;
-class Particles;
-class BadGuy;
-class Tile;
+class CollisionGrid;
struct SpawnPoint
{
struct SpawnPoint
{
@@
-115,8
+107,10
@@
public:
/** Get total number of badguys */
int get_total_badguys();
/** Get total number of badguys */
int get_total_badguys();
-private:
+ // make this private again soon
void collision_tilemap(MovingObject* object, int depth);
void collision_tilemap(MovingObject* object, int depth);
+
+private:
void collision_object(MovingObject* object1, MovingObject* object2);
void load_music();
void collision_object(MovingObject* object1, MovingObject* object2);
void load_music();
@@
-142,11
+136,11
@@
private:
std::vector<Bullet*> bullets;
public: // TODO make this private again
std::vector<Bullet*> bullets;
public: // TODO make this private again
- typedef std::vector<InteractiveObject*> InteractiveObjects;
- InteractiveObjects interactive_objects;
typedef std::vector<GameObject*> GameObjects;
GameObjects gameobjects;
typedef std::vector<GameObject*> GameObjects;
GameObjects gameobjects;
+ Rectangle get_active_region();
+
private:
void fix_old_tiles();
private:
void fix_old_tiles();
@@
-157,6
+151,8
@@
private:
SpawnPoints spawnpoints;
int currentmusic;
SpawnPoints spawnpoints;
int currentmusic;
+
+ CollisionGrid* grid;
};
#endif
};
#endif