#include "video/screen.h"
#include "video/drawing_context.h"
#include "utils/lispreader.h"
+#include "special/frame_rate.h"
#include "gameloop.h"
#include "app/setup.h"
#include "sector.h"
#include "app/gettext.h"
#include "misc.h"
-#define DISPLAY_MAP_MESSAGE_TIME 2600
+#define DISPLAY_MAP_MESSAGE_TIME 2800
Menu* worldmap_menu = 0;
WorldMap::SpecialTile* special_tile = worldmap->at_special_tile();
if(special_tile && special_tile->passive_message)
- special_tile->display_map_message_timer.start(DISPLAY_MAP_MESSAGE_TIME);
+ {
+ worldmap->passive_message = special_tile->display_map_message;
+ worldmap->passive_message_timer.start(DISPLAY_MAP_MESSAGE_TIME);
+ }
if (worldmap->at(tile_pos)->stop || (special_tile &&
!special_tile->passive_message))
special_tile.passive_message = false;
if(!special_tile.display_map_message.empty())
special_tile.passive_message = true;
- special_tile.display_map_message_timer.init(true);
reader.read_string("map-message", special_tile.display_map_message);
reader.read_string("next-world", special_tile.next_worldmap);
reader.read_string("level", special_tile.level_name, true);
LispReader* reader = LispReader::load(datadir + "/levels/" + special_tile.level_name, "supertux-level");
if(!reader)
{
- std::cerr << "Error: Could not open special_tile file. Ignoring...\n";
+ std::cerr << "Error: Could not open level file. Ignoring...\n";
return;
}
}
}
}
- for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
- {
- /* Display a passive message in the map, if any as been selected */
- if(i->display_map_message_timer.check())
- {
- if(!i->display_map_message.empty())
- context.draw_text_center(gold_text, i->display_map_message,
- Vector(0, screen->h - white_text->get_height() - 60),
- LAYER_FOREGROUND1);
- break;
- }
- }
+ /* Display a passive message in the map, if needed */
+ if(passive_message_timer.check())
+ context.draw_text_center(gold_text, passive_message,
+ Vector(0, screen->h - white_text->get_height() - 60),
+ LAYER_FOREGROUND1);
}
void
song = SoundManager::get()->load_music(datadir + "/music/" + music);
SoundManager::get()->play_music(song);
-
- unsigned int last_update_time;
- unsigned int update_time;
- last_update_time = update_time = Ticks::get();
+ FrameRate frame_rate(10);
+ frame_rate.set_frame_limit(false);
+
+ frame_rate.start();
DrawingContext context;
while(!quit)
{
- float delta = ((float)(update_time-last_update_time))/100.0;
+ float delta = frame_rate.get();
delta *= 1.3f;
if (delta > 10.0f)
delta = .3f;
-
- last_update_time = update_time;
- update_time = Ticks::get();
+
+ frame_rate.update();
Vector tux_pos = tux->get_pos();
if (1)
draw(context, offset);
get_input();
update(delta);
-
+
if(Menu::current())
{
Menu::current()->draw(context);