Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13312
Modified Files:
gameloop.cpp
Log Message:
patch from MatzeB for freeze at level start
Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- gameloop.cpp 21 Apr 2004 23:36:39 -0000 1.92
+++ gameloop.cpp 22 Apr 2004 00:00:58 -0000 1.93
@@ -57,10 +57,17 @@
GameSession* GameSession::current_ = 0;
GameSession::GameSession(const std::string& subset_, int levelnb_, int mode)
- : world(0), st_gl_mode(mode), levelnb(levelnb_), subset(subset_)
+ : world(0), st_gl_mode(mode), levelnb(levelnb_), end_sequenze(false),
+ subset(subset_)
{
current_ = this;
- end_sequenze = false;
+
+ global_frame_counter = 0;
+ game_pause = false;
+
+ fps_timer.init(true);
+ frame_timer.init(true);
+
restart_level();
}
@@ -470,16 +477,9 @@
Player* tux = world->get_tux();
current_ = this;
- int fps_cnt;
-
- global_frame_counter = 0;
- game_pause = false;
-
- fps_timer.init(true);
- frame_timer.init(true);
+ int fps_cnt = 0;
- last_update_time = st_get_ticks();
- fps_cnt = 0;
+ update_time = last_update_time = st_get_ticks();
/* Clear screen: */
clearscreen(0, 0, 0);
|