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
5e71456
..
d98ff54
100644
(file)
--- a/
src/gameloop.h
+++ b/
src/gameloop.h
@@
-25,6
+25,7
@@
#include "special/timer.h"
#include "special/base.h"
#include "special/frame_rate.h"
#include "special/timer.h"
#include "special/base.h"
#include "special/frame_rate.h"
+#include "statistics.h"
using namespace SuperTux;
using namespace SuperTux;
@@
-45,6
+46,7
@@
extern int game_started;
class Level;
class Sector;
class Level;
class Sector;
+class Statistics;
namespace SuperTux {
class DrawingContext;
namespace SuperTux {
class DrawingContext;
@@
-67,7
+69,6
@@
private:
float fps_fps;
FrameRate frame_rate;
int pause_menu_frame;
float fps_fps;
FrameRate frame_rate;
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 */
@@
-87,6
+88,7
@@
private:
// the sector and spawnpoint we shoudl spawn after this frame
std::string newsector;
std::string newspawnpoint;
// 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:
@@
-95,7
+97,7
@@
public:
DrawingContext* context;
Timer time_left;
DrawingContext* context;
Timer time_left;
- GameSession(const std::string& level, int mode, bool flip_level_ = false);
+ GameSession(const std::string& level, int mode, bool flip_level_ = false
, Statistics* statistics = NULL
);
~GameSession();
/** Enter the busy loop */
~GameSession();
/** Enter the busy loop */
@@
-116,6
+118,17
@@
public:
private:
static GameSession* current_;
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();
@@
-127,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();
};