From: Ingo Ruhnke Date: Tue, 27 Apr 2004 18:44:19 +0000 (+0000) Subject: - made worldmap CPU independend, needs testing X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e153dbd4e932d55775a898ed3055e50ea3ac3542;p=supertux.git - made worldmap CPU independend, needs testing SVN-Revision: 788 --- diff --git a/src/worldmap.cpp b/src/worldmap.cpp index 626644f78..961b63713 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -627,7 +627,7 @@ WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos) } void -WorldMap::update() +WorldMap::update(float delta) { if (enter_level && !tux->is_moving()) { @@ -674,7 +674,7 @@ WorldMap::update() if (dir != NONE) { tux->set_direction(dir); - tux->update(0.33f); + tux->update(delta); } std::cout << "Walk to dir: " << dir << std::endl; @@ -723,7 +723,7 @@ WorldMap::update() else { tux->set_direction(input_direction); - tux->update(0.33f); + tux->update(delta); } Menu* menu = Menu::current(); @@ -853,33 +853,46 @@ WorldMap::display() song = music_manager->load_music(datadir + "/music/" + music); music_manager->play_music(song); - while(!quit) { - Point tux_pos = tux->get_pos(); - if (1) - { - offset.x = -tux_pos.x + screen->w/2; - offset.y = -tux_pos.y + screen->h/2; + unsigned int last_update_time; + unsigned int update_time; - if (offset.x > 0) offset.x = 0; - if (offset.y > 0) offset.y = 0; + last_update_time = update_time = st_get_ticks(); - if (offset.x < screen->w - width*32) offset.x = screen->w - width*32; - if (offset.y < screen->h - height*32) offset.y = screen->h - height*32; - } + while(!quit) + { + float delta = ((float)(update_time-last_update_time))/100.0; - draw(offset); - get_input(); - update(); + delta *= 1.3f; - if(Menu::current()) - { - Menu::current()->draw(); - mouse_cursor->draw(); - } - flipscreen(); + last_update_time = update_time; + update_time = st_get_ticks(); - SDL_Delay(20); - } + Point tux_pos = tux->get_pos(); + if (1) + { + offset.x = -tux_pos.x + screen->w/2; + offset.y = -tux_pos.y + screen->h/2; + + if (offset.x > 0) offset.x = 0; + if (offset.y > 0) offset.y = 0; + + if (offset.x < screen->w - width*32) offset.x = screen->w - width*32; + if (offset.y < screen->h - height*32) offset.y = screen->h - height*32; + } + + draw(offset); + get_input(); + update(delta); + + if(Menu::current()) + { + Menu::current()->draw(); + mouse_cursor->draw(); + } + flipscreen(); + + SDL_Delay(20); + } } void diff --git a/src/worldmap.h b/src/worldmap.h index 8990dcf7a..a4898fbf6 100644 --- a/src/worldmap.h +++ b/src/worldmap.h @@ -191,7 +191,7 @@ public: void get_input(); /** Update Tux position */ - void update(); + void update(float delta); /** Draw one frame */ void draw(const Point& offset);