projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Got rid of a superfluous debug message
[supertux.git]
/
src
/
sector.hpp
diff --git
a/src/sector.hpp
b/src/sector.hpp
index
65e2a0f
..
1fc487e
100644
(file)
--- a/
src/sector.hpp
+++ b/
src/sector.hpp
@@
-19,15
+19,14
@@
#ifndef SUPERTUX_SECTOR_H
#define SUPERTUX_SECTOR_H
#ifndef SUPERTUX_SECTOR_H
#define SUPERTUX_SECTOR_H
-#include <string>
#include <vector>
#include <list>
#include <memory>
#include <squirrel.h>
#include "direction.hpp"
#include <vector>
#include <list>
#include <memory>
#include <squirrel.h>
#include "direction.hpp"
-#include "
math/vect
or.hpp"
-#include "
video/drawing_context
.hpp"
+#include "
video/col
or.hpp"
+#include "
scripting/ssector
.hpp"
namespace lisp {
class Lisp;
namespace lisp {
class Lisp;
@@
-37,6
+36,7
@@
namespace collision {
class Constraints;
}
class Constraints;
}
+class Vector;
class Rect;
class Sprite;
class GameObject;
class Rect;
class Sprite;
class GameObject;
@@
-50,6
+50,7
@@
class MovingObject;
class CollisionHit;
class Level;
class Portable;
class CollisionHit;
class Level;
class Portable;
+class DrawingContext;
enum MusicType {
LEVEL_MUSIC,
enum MusicType {
LEVEL_MUSIC,
@@
-61,7
+62,7
@@
enum MusicType {
* This class holds a sector (a part of a level) and all the game objects in
* the sector
*/
* This class holds a sector (a part of a level) and all the game objects in
* the sector
*/
-class Sector
+class Sector
: public Scripting::SSector
{
public:
Sector(Level* parent);
{
public:
Sector(Level* parent);
@@
-132,20
+133,20
@@
public:
void collision_tilemap(collision::Constraints* constraints,
const Vector& movement, const Rect& dest) const;
void collision_tilemap(collision::Constraints* constraints,
const Vector& movement, const Rect& dest) const;
- /**
+ /**
* Checks if the specified rectangle is free of (solid) tiles.
* Note that this does not include static objects, e.g. bonus blocks.
*/
* Checks if the specified rectangle is free of (solid) tiles.
* Note that this does not include static objects, e.g. bonus blocks.
*/
- bool is_free_of_tiles(const Rect& rect) const;
- /**
- * Checks if the specified rectangle is free of both
+ bool is_free_of_tiles(const Rect& rect
, const bool ignoreUnisolid = false
) const;
+ /**
+ * Checks if the specified rectangle is free of both
* 1.) solid tiles and
* 2.) MovingObjects in COLGROUP_STATIC.
* Note that this does not include badguys or players.
*/
* 1.) solid tiles and
* 2.) MovingObjects in COLGROUP_STATIC.
* Note that this does not include badguys or players.
*/
- bool is_free_of_statics(const Rect& rect, const MovingObject* ignore_object = 0) const;
- /**
- * Checks if the specified rectangle is free of both
+ bool is_free_of_statics(const Rect& rect, const MovingObject* ignore_object = 0
, const bool ignoreUnisolid = false
) const;
+ /**
+ * Checks if the specified rectangle is free of both
* 1.) solid tiles and
* 2.) MovingObjects in COLGROUP_STATIC, COLGROUP_MOVINGSTATIC or COLGROUP_MOVING.
* This includes badguys and players.
* 1.) solid tiles and
* 2.) MovingObjects in COLGROUP_STATIC, COLGROUP_MOVINGSTATIC or COLGROUP_MOVING.
* This includes badguys and players.
@@
-181,6
+182,15
@@
public:
typedef std::vector<SpawnPoint*> SpawnPoints;
typedef std::vector<Portable*> Portables;
typedef std::vector<SpawnPoint*> SpawnPoints;
typedef std::vector<Portable*> Portables;
+ // --- Scripting ---
+ /**
+ * get/set color of ambient light
+ */
+ void set_ambient_light(float red, float green, float blue);
+ float get_ambient_red();
+ float get_ambient_green();
+ float get_ambient_blue();
+
private:
Level* level; /**< Parent level containing this sector */
uint32_t collision_tile_attributes(const Rect& dest) const;
private:
Level* level; /**< Parent level containing this sector */
uint32_t collision_tile_attributes(const Rect& dest) const;
@@
-190,6
+200,8
@@
private:
void try_expose(GameObject* object);
void try_unexpose(GameObject* object);
void try_expose(GameObject* object);
void try_unexpose(GameObject* object);
+ void try_expose_me();
+ void try_unexpose_me();
/** Checks for all possible collisions. And calls the
collision_handlers, which the collision_objects provide for this
/** Checks for all possible collisions. And calls the
collision_handlers, which the collision_objects provide for this