projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nolok dies properly now :)
[supertux.git]
/
src
/
sector.h
diff --git
a/src/sector.h
b/src/sector.h
index
05595ab
..
598842b
100644
(file)
--- a/
src/sector.h
+++ b/
src/sector.h
@@
-24,16
+24,18
@@
#include <vector>
#include "math/vector.h"
#include <vector>
#include "math/vector.h"
-#include "badguy.h"
#include "audio/musicref.h"
#include "video/drawing_context.h"
#include "audio/musicref.h"
#include "video/drawing_context.h"
+#include "defines.h"
using namespace SuperTux;
namespace SuperTux {
class GameObject;
class LispReader;
using namespace SuperTux;
namespace SuperTux {
class GameObject;
class LispReader;
+class LispWriter;
class Sprite;
class Sprite;
+class Rectangle;
}
class InteractiveObject;
}
class InteractiveObject;
@@
-104,9
+106,6
@@
public:
bool add_bullet(const Vector& pos, float xm, Direction dir);
bool add_smoke_cloud(const Vector& pos);
bool add_bullet(const Vector& pos, float xm, Direction dir);
bool add_smoke_cloud(const Vector& pos);
- bool add_particles(const Vector& epicenter, int min_angle, int max_angle,
- const Vector& initial_velocity, const Vector& acceleration, int number,
- Color color, int size, int life_time, int drawing_layer);
void add_floating_text(const Vector& pos, const std::string& text);
/** Flip the all the sector vertically. The purpose of this is to let
void add_floating_text(const Vector& pos, const std::string& text);
/** Flip the all the sector vertically. The purpose of this is to let
@@
-125,7
+124,7
@@
private:
void collision_object(MovingObject* object1, MovingObject* object2);
void load_music();
void collision_object(MovingObject* object1, MovingObject* object2);
void load_music();
- GameObject* parse
O
bject(const std::string& name, LispReader& reader);
+ GameObject* parse
_o
bject(const std::string& name, LispReader& reader);
static Sector* _current;
static Sector* _current;
@@
-154,6
+153,8
@@
public: // TODO make this private again
GameObjects gameobjects;
private:
GameObjects gameobjects;
private:
+ void fix_old_tiles();
+
/// 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;