projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- added check for 'region' symbol
[supertux.git]
/
src
/
mainloop.hpp
diff --git
a/src/mainloop.hpp
b/src/mainloop.hpp
index
47621f3
..
cb5bbed
100644
(file)
--- a/
src/mainloop.hpp
+++ b/
src/mainloop.hpp
@@
-33,7
+33,7
@@
class MainLoop
public:
MainLoop();
~MainLoop();
public:
MainLoop();
~MainLoop();
-
+
void run();
void exit_screen(ScreenFade* fade = NULL);
void quit(ScreenFade* fade = NULL);
void run();
void exit_screen(ScreenFade* fade = NULL);
void quit(ScreenFade* fade = NULL);
@@
-48,11
+48,17
@@
public:
private:
void draw_fps(DrawingContext& context, float fps);
private:
void draw_fps(DrawingContext& context, float fps);
-
+ void draw(DrawingContext& context);
+ void update_gamelogic(float elapsed_time);
+ void process_events();
+ void handle_screen_switch();
+
bool running;
float speed;
bool nextpop;
bool nextpush;
bool running;
float speed;
bool nextpop;
bool nextpush;
+ /// measured fps
+ float fps;
std::auto_ptr<Screen> next_screen;
std::auto_ptr<Screen> current_screen;
std::auto_ptr<Console> console;
std::auto_ptr<Screen> next_screen;
std::auto_ptr<Screen> current_screen;
std::auto_ptr<Console> console;
@@
-63,4
+69,3
@@
private:
extern MainLoop* main_loop;
#endif
extern MainLoop* main_loop;
#endif
-