projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix
[supertux.git]
/
src
/
sector.h
diff --git
a/src/sector.h
b/src/sector.h
index
ad735f4
..
51a135b
100644
(file)
--- a/
src/sector.h
+++ b/
src/sector.h
@@
-41,13
+41,7
@@
class TileMap;
class Bullet;
class CollisionGrid;
class ScriptInterpreter;
class Bullet;
class CollisionGrid;
class ScriptInterpreter;
-
-class SpawnPoint
-{
-public:
- std::string name;
- Vector pos;
-};
+class SpawnPoint;
enum MusicType {
LEVEL_MUSIC,
enum MusicType {
LEVEL_MUSIC,
@@
-73,7
+67,7
@@
public:
void activate(const std::string& spawnpoint);
void activate(const Vector& player_pos);
void activate(const std::string& spawnpoint);
void activate(const Vector& player_pos);
- void
action
(float elapsed_time);
+ void
update
(float elapsed_time);
void update_game_objects();
void draw(DrawingContext& context);
void update_game_objects();
void draw(DrawingContext& context);
@@
-101,7
+95,7
@@
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..
. */
+ /**
get currently activated sector
. */
static Sector* current()
{ return _current; }
static Sector* current()
{ return _current; }
@@
-148,7
+142,7
@@
public: // TODO make this private again
private:
void fix_old_tiles();
private:
void fix_old_tiles();
- /// container for newly created objects, they'll be added in Sector::
action
+ /// container for newly created objects, they'll be added in Sector::
update
GameObjects gameobjects_new;
MusicType currentmusic;
GameObjects gameobjects_new;
MusicType currentmusic;