projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved my personal scons todo to the global one, so that someone else can work on...
[supertux.git]
/
src
/
gameloop.h
diff --git
a/src/gameloop.h
b/src/gameloop.h
index
4e990f3
..
d98ff54
100644
(file)
--- a/
src/gameloop.h
+++ b/
src/gameloop.h
@@
-22,8
+22,12
@@
#ifndef SUPERTUX_GAMELOOP_H
#define SUPERTUX_GAMELOOP_H
#ifndef SUPERTUX_GAMELOOP_H
#define SUPERTUX_GAMELOOP_H
-#include "sound.h"
-#include "type.h"
+#include "special/timer.h"
+#include "special/base.h"
+#include "special/frame_rate.h"
+#include "statistics.h"
+
+using namespace SuperTux;
/* GameLoop modes */
/* GameLoop modes */
@@
-33,11
+37,20
@@
#define ST_GL_LOAD_LEVEL_FILE 3
#define ST_GL_DEMO_GAME 4
#define ST_GL_LOAD_LEVEL_FILE 3
#define ST_GL_DEMO_GAME 4
+enum GameMenuIDs {
+ MNID_CONTINUE,
+ MNID_ABORTLEVEL
+ };
+
extern int game_started;
class Level;
class Sector;
extern int game_started;
class Level;
class Sector;
+class Statistics;
+
+namespace SuperTux {
class DrawingContext;
class DrawingContext;
+}
/** The GameSession class controlls the controll flow of a World, ie.
present the menu on specifc keypresses, render and update it while
/** The GameSession class controlls the controll flow of a World, ie.
present the menu on specifc keypresses, render and update it while
@@
-54,10
+67,8
@@
private:
int st_gl_mode;
int levelnb;
float fps_fps;
int st_gl_mode;
int levelnb;
float fps_fps;
- unsigned int last_update_time;
- unsigned int update_time;
+ FrameRate frame_rate;
int pause_menu_frame;
int pause_menu_frame;
- int debug_fps;
/** If true the end_sequence will be played, user input will be
ignored while doing that */
/** If true the end_sequence will be played, user input will be
ignored while doing that */
@@
-72,6
+83,12
@@
private:
bool game_pause;
std::string levelname;
bool game_pause;
std::string levelname;
+ bool flip_level;
+
+ // the sector and spawnpoint we shoudl spawn after this frame
+ std::string newsector;
+ std::string newspawnpoint;
+
public:
enum ExitStatus { ES_NONE, ES_LEVEL_FINISHED, ES_GAME_OVER, ES_LEVEL_ABORT };
private:
public:
enum ExitStatus { ES_NONE, ES_LEVEL_FINISHED, ES_GAME_OVER, ES_LEVEL_ABORT };
private:
@@
-80,7
+97,7
@@
public:
DrawingContext* context;
Timer time_left;
DrawingContext* context;
Timer time_left;
- GameSession(const std::string& level, int mode);
+ GameSession(const std::string& level, int mode
, bool flip_level_ = false, Statistics* statistics = NULL
);
~GameSession();
/** Enter the busy loop */
~GameSession();
/** Enter the busy loop */
@@
-93,12
+110,25
@@
public:
{ current_ = this; }
static GameSession* current() { return current_; }
{ current_ = this; }
static GameSession* current() { return current_; }
+ void respawn(const std::string& sectorname,
+ const std::string& spawnpointname);
Sector* get_current_sector()
{ return currentsector; }
private:
static GameSession* current_;
Sector* get_current_sector()
{ return currentsector; }
private:
static GameSession* current_;
+ // for cheating
+ std::string last_keys;
+ // for fire works
+ Timer random_timer;
+
+ // swap points
+ Vector last_swap_point;
+ Statistics last_swap_stats;
+
+ Statistics* best_level_statistics;
+
void restart_level();
void check_end_conditions();
void restart_level();
void check_end_conditions();
@@
-110,7
+140,6
@@
private:
void drawendscreen();
void drawresultscreen(void);
void drawendscreen();
void drawresultscreen(void);
-private:
void on_escape_press();
void process_menu();
};
void on_escape_press();
void process_menu();
};
@@
-120,5
+149,8
@@
std::string slotinfo(int slot);
bool rectcollision(base_type* one, base_type* two);
void bumpbrick(float x, float y);
bool rectcollision(base_type* one, base_type* two);
void bumpbrick(float x, float y);
+/** Return true if the gameloop() was entered, false otherwise */
+bool process_load_game_menu();
+
#endif /*SUPERTUX_GAMELOOP_H*/
#endif /*SUPERTUX_GAMELOOP_H*/