projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed setup.cpp not finding correct data path
[supertux.git]
/
src
/
sector.h
diff --git
a/src/sector.h
b/src/sector.h
index
45a2cd5
..
5f31dc9
100644
(file)
--- a/
src/sector.h
+++ b/
src/sector.h
@@
-32,25
+32,19
@@
using namespace SuperTux;
namespace SuperTux {
class GameObject;
namespace SuperTux {
class GameObject;
-class LispReader;
-class LispWriter;
class Sprite;
class Rectangle;
}
class Sprite;
class Rectangle;
}
+namespace lisp {
+class Lisp;
+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
{
@@
-68,10
+62,10
@@
public:
~Sector();
/// read sector from lisp file
~Sector();
/// read sector from lisp file
- void parse(
LispReader& reader
);
- void parse_old_format(
LispReader& reader
);
+ void parse(
const lisp::Lisp& lisp
);
+ void parse_old_format(
const lisp::Lisp& lisp
);
/// write sector to lisp file
/// write sector to lisp file
- void write(
Lisp
Writer& writer);
+ void write(
lisp::
Writer& writer);
/// activates this sector (change music, intialize player class, ...)
void activate(const std::string& spawnpoint = "main");
/// activates this sector (change music, intialize player class, ...)
void activate(const std::string& spawnpoint = "main");
@@
-113,12
+107,14
@@
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();
- GameObject* parse_object(const std::string& name,
LispReader& reader
);
+ GameObject* parse_object(const std::string& name,
const lisp::Lisp& lisp
);
static Sector* _current;
static Sector* _current;
@@
-140,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();
@@
-155,6
+151,8
@@
private:
SpawnPoints spawnpoints;
int currentmusic;
SpawnPoints spawnpoints;
int currentmusic;
+
+ CollisionGrid* grid;
};
#endif
};
#endif