projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small fix to MrRocket
[supertux.git]
/
src
/
sector.h
diff --git
a/src/sector.h
b/src/sector.h
index
45a2cd5
..
464a64f
100644
(file)
--- a/
src/sector.h
+++ b/
src/sector.h
@@
-23,37
+23,32
@@
#include <string>
#include <vector>
#include <string>
#include <vector>
+#include "direction.h"
#include "math/vector.h"
#include "audio/musicref.h"
#include "video/drawing_context.h"
#include "math/vector.h"
#include "audio/musicref.h"
#include "video/drawing_context.h"
-#include "defines.h"
using namespace SuperTux;
namespace SuperTux {
class GameObject;
using namespace SuperTux;
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
+
class
SpawnPoint
{
{
+public:
std::string name;
Vector pos;
};
std::string name;
Vector pos;
};
@@
-68,15
+63,14
@@
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, ...)
/// activates this sector (change music, intialize player class, ...)
- void activate(const std::string& spawnpoint = "main");
- /// get best spawn point
- Vector get_best_spawn_point(Vector pos);
+ void activate(const std::string& spawnpoint);
+ void activate(const Vector& player_pos);
void action(float elapsed_time);
void update_game_objects();
void action(float elapsed_time);
void update_game_objects();
@@
-106,19
+100,21
@@
public:
bool add_smoke_cloud(const Vector& pos);
void add_floating_text(const Vector& pos, const std::string& text);
bool add_smoke_cloud(const Vector& pos);
void add_floating_text(const Vector& pos, const std::string& text);
- /** @evil@ but can
#
t always be avoided in current design... */
+ /** @evil@ but can
'
t always be avoided in current design... */
static Sector* current()
{ return _current; }
/** Get total number of badguys */
int get_total_badguys();
static Sector* current()
{ return _current; }
/** 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,10
+136,12
@@
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;
+ typedef std::vector<SpawnPoint*> SpawnPoints;
+ SpawnPoints spawnpoints;
+
+ Rectangle get_active_region();
private:
void fix_old_tiles();
private:
void fix_old_tiles();
@@
-151,10
+149,9
@@
private:
/// container for newly created objects, they'll be added in Sector::action
GameObjects gameobjects_new;
/// container for newly created objects, they'll be added in Sector::action
GameObjects gameobjects_new;
- typedef std::vector<SpawnPoint*> SpawnPoints;
- SpawnPoints spawnpoints;
-
int currentmusic;
int currentmusic;
+
+ CollisionGrid* grid;
};
#endif
};
#endif