X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=961b637136629a128847a0113b784040176b2153;hb=e153dbd4e932d55775a898ed3055e50ea3ac3542;hp=415e8a4add88683c57a89132525b5b43e4a360e2;hpb=2ec1be264110139466ab70422b8f4fd9c22e5c8c;p=supertux.git diff --git a/src/worldmap.cpp b/src/worldmap.cpp index 415e8a4ad..961b63713 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -110,6 +110,7 @@ TileManager::TileManager() tile->south = true; tile->west = true; tile->stop = true; + tile->auto_walk = false; LispReader reader(lisp_cdr(element)); reader.read_int("id", &id); @@ -118,6 +119,7 @@ TileManager::TileManager() reader.read_bool("west", &tile->west); reader.read_bool("east", &tile->east); reader.read_bool("stop", &tile->stop); + reader.read_bool("auto-walk", &tile->auto_walk); reader.read_string("image", &filename); tile->sprite = new Surface( @@ -163,7 +165,10 @@ TileManager::get(int i) Tux::Tux(WorldMap* worldmap_) : worldmap(worldmap_) { - sprite = new Surface(datadir + "/images/worldmap/tux.png", USE_ALPHA); + largetux_sprite = new Surface(datadir + "/images/worldmap/tux.png", USE_ALPHA); + firetux_sprite = new Surface(datadir + "/images/worldmap/firetux.png", USE_ALPHA); + smalltux_sprite = new Surface(datadir + "/images/worldmap/smalltux.png", USE_ALPHA); + offset = 0; moving = false; tile_pos.x = 4; @@ -174,15 +179,30 @@ Tux::Tux(WorldMap* worldmap_) Tux::~Tux() { - delete sprite; + delete smalltux_sprite; + delete firetux_sprite; + delete largetux_sprite; } void Tux::draw(const Point& offset) { Point pos = get_pos(); - sprite->draw(pos.x + offset.x, - pos.y + offset.y - 10); + switch (player_status.bonus) + { + case PlayerStatus::GROWUP_BONUS: + largetux_sprite->draw(pos.x + offset.x, + pos.y + offset.y - 10); + break; + case PlayerStatus::FLOWER_BONUS: + firetux_sprite->draw(pos.x + offset.x, + pos.y + offset.y - 10); + break; + case PlayerStatus::NO_BONUS: + smalltux_sprite->draw(pos.x + offset.x, + pos.y + offset.y - 10); + break; + } } @@ -265,6 +285,33 @@ Tux::update(float delta) } else { + if (worldmap->at(tile_pos)->auto_walk) + { // Turn to a new direction + Tile* tile = worldmap->at(tile_pos); + Direction dir = NONE; + + if (tile->north && back_direction != NORTH) + dir = NORTH; + else if (tile->south && back_direction != SOUTH) + dir = SOUTH; + else if (tile->east && back_direction != EAST) + dir = EAST; + else if (tile->west && back_direction != WEST) + dir = WEST; + + if (dir != NONE) + { + direction = dir; + back_direction = reverse_dir(direction); + } + else + { + // Should never be reached if tiledata is good + stop(); + return; + } + } + // Walk automatically to the next tile Point next_tile; if (worldmap->path_ok(direction, tile_pos, &next_tile)) @@ -373,6 +420,7 @@ WorldMap::load_map() level.south = true; level.west = true; + reader.read_string("extro-filename", &level.extro_filename); reader.read_string("name", &level.name); reader.read_int("x", &level.x); reader.read_int("y", &level.y); @@ -579,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()) { @@ -626,11 +674,18 @@ WorldMap::update() if (dir != NONE) { tux->set_direction(dir); - tux->update(0.33f); + tux->update(delta); } std::cout << "Walk to dir: " << dir << std::endl; } + + if (!level->extro_filename.empty()) + { // Display final credits and go back to the main menu + display_text_file(level->extro_filename, + "/images/background/arctis2.jpg"); + quit = true; + } } break; @@ -668,7 +723,7 @@ WorldMap::update() else { tux->set_direction(input_direction); - tux->update(0.33f); + tux->update(delta); } Menu* menu = Menu::current(); @@ -798,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 @@ -874,6 +942,12 @@ WorldMap::loadgame(const std::string& filename) return; lisp_object_t* savegame = lisp_read_from_file(filename); + if (!savegame) + { + std::cout << "WorldMap:loadgame: File not found: " << filename << std::endl; + return; + } + lisp_object_t* cur = savegame; if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0)