X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=7f87ad4aee6e759906fdf4a17accb085c88dec8e;hb=6ed1900da4edf7d7922f7a4626f95a83e34dff82;hp=f67109d4a8e7757b39f9ec6f2e5f326de9684940;hpb=b2d8d1eac9fd6328d3a8c61cf09d4b2882145042;p=supertux.git diff --git a/src/worldmap.cpp b/src/worldmap.cpp index f67109d4a..7f87ad4ae 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -436,6 +436,8 @@ WorldMap::load_map() reader.read_string("level", level.name, true); reader.read_int("x", level.x); reader.read_int("y", level.y); + level.auto_path = true; + reader.read_bool("auto-path", level.auto_path); level.swap_x = level.swap_y = -1; reader.read_int("swap-x", level.swap_x); reader.read_int("swap-y", level.swap_y); @@ -695,7 +697,7 @@ WorldMap::update(float delta) else player_status.bonus = PlayerStatus::NO_BONUS; - if (old_level_state != level->solved) + if (old_level_state != level->solved && level->auto_path) { // Try to detect the next direction to which we should walk // FIXME: Mostly a hack Direction dir = D_NONE; @@ -960,7 +962,7 @@ WorldMap::display() unsigned int last_update_time; unsigned int update_time; - last_update_time = update_time = st_get_ticks(); + last_update_time = update_time = Ticks::get(); DrawingContext context; while(!quit) @@ -973,7 +975,7 @@ WorldMap::display() delta = .3f; last_update_time = update_time; - update_time = st_get_ticks(); + update_time = Ticks::get(); Vector tux_pos = tux->get_pos(); if (1)