X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=961b637136629a128847a0113b784040176b2153;hb=e153dbd4e932d55775a898ed3055e50ea3ac3542;hp=95a4c6475520eeac46e4fd2864d994136623741b;hpb=124f4e8b620da57a58b3a55e9424fe074ccae32c;p=supertux.git diff --git a/src/worldmap.cpp b/src/worldmap.cpp index 95a4c6475..961b63713 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -28,6 +28,7 @@ #include "gameloop.h" #include "setup.h" #include "worldmap.h" +#include "resources.h" namespace WorldMapNS { @@ -82,11 +83,9 @@ string_to_direction(const std::string& directory) return NONE; } -TileManager* TileManager::instance_ = 0; - TileManager::TileManager() { - std::string stwt_filename = datadir + "images/worldmap/antarctica.stwt"; + std::string stwt_filename = datadir + "/images/worldmap/antarctica.stwt"; lisp_object_t* root_obj = lisp_read_from_file(stwt_filename); if (!root_obj) @@ -111,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); @@ -119,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( @@ -142,6 +143,14 @@ TileManager::TileManager() { assert(0); } + + lisp_free(root_obj); +} + +TileManager::~TileManager() +{ + for(std::vector::iterator i = tiles.begin(); i != tiles.end(); ++i) + delete *i; } Tile* @@ -151,24 +160,49 @@ TileManager::get(int i) return tiles[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 = 5; + tile_pos.x = 4; tile_pos.y = 5; direction = NONE; input_direction = NONE; } +Tux::~Tux() +{ + 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); + 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; + } } @@ -251,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)) @@ -267,8 +328,21 @@ Tux::update(float delta) } } +//--------------------------------------------------------------------------- +Tile::Tile() +{ +} + +Tile::~Tile() +{ + delete sprite; +} + +//--------------------------------------------------------------------------- + WorldMap::WorldMap() { + tile_manager = new TileManager(); tux = new Tux(this); width = 20; @@ -283,7 +357,6 @@ WorldMap::WorldMap() name = ""; music = "SALCON.MOD"; - song = 0; load_map(); } @@ -291,12 +364,17 @@ WorldMap::WorldMap() WorldMap::~WorldMap() { delete tux; + delete tile_manager; + + delete level_sprite; + delete leveldot_green; + delete leveldot_red; } void WorldMap::load_map() { - std::string filename = datadir + "levels/default/worldmap.stwm"; + std::string filename = datadir + "/levels/default/worldmap.stwm"; lisp_object_t* root_obj = lisp_read_from_file(filename); if (!root_obj) @@ -342,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); @@ -362,38 +441,42 @@ WorldMap::load_map() cur = lisp_cdr(cur); } } + + lisp_free(root_obj); } void WorldMap::get_level_title(Levels::pointer level) { -/** get level's title */ -level->title = ""; + /** get level's title */ + level->title = ""; -FILE * fi; -lisp_object_t* root_obj = 0; -fi = fopen((datadir + "levels/" + level->name).c_str(), "r"); -if (fi == NULL) + FILE * fi; + lisp_object_t* root_obj = 0; + fi = fopen((datadir + "/levels/" + level->name).c_str(), "r"); + if (fi == NULL) { - perror((datadir + "levels/" + level->name).c_str()); - return; + perror((datadir + "/levels/" + level->name).c_str()); + return; } -lisp_stream_t stream; -lisp_stream_init_file (&stream, fi); -root_obj = lisp_read (&stream); + lisp_stream_t stream; + lisp_stream_init_file (&stream, fi); + root_obj = lisp_read (&stream); -if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR) + if (root_obj->type == LISP_TYPE_EOF || root_obj->type == LISP_TYPE_PARSE_ERROR) { - printf("World: Parse Error in file %s", level->name.c_str()); + printf("World: Parse Error in file %s", level->name.c_str()); } -if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) + if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) { - LispReader reader(lisp_cdr(root_obj)); - reader.read_string("name", &level->title); + LispReader reader(lisp_cdr(root_obj)); + reader.read_string("name", &level->title); } -fclose(fi); + lisp_free(root_obj); + + fclose(fi); } void @@ -544,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()) { @@ -555,15 +638,56 @@ WorldMap::update() level->y == tux->get_tile_pos().y) { std::cout << "Enter the current level: " << level->name << std::endl;; - halt_music(); - - GameSession session(datadir + "levels/" + level->name, + GameSession session(datadir + "/levels/" + level->name, 1, ST_GL_LOAD_LEVEL_FILE); switch (session.run()) { case GameSession::LEVEL_FINISHED: - level->solved = true; + { + bool old_level_state = level->solved; + level->solved = true; + + if (session.get_world()->get_tux()->got_coffee) + player_status.bonus = PlayerStatus::FLOWER_BONUS; + else if (session.get_world()->get_tux()->size == BIG) + player_status.bonus = PlayerStatus::GROWUP_BONUS; + else + player_status.bonus = PlayerStatus::NO_BONUS; + + if (old_level_state != level->solved) + { // Try to detect the next direction to which we should walk + // FIXME: Mostly a hack + Direction dir = NONE; + + Tile* tile = at(tux->get_tile_pos()); + + if (tile->north && tux->back_direction != NORTH) + dir = NORTH; + else if (tile->south && tux->back_direction != SOUTH) + dir = SOUTH; + else if (tile->east && tux->back_direction != EAST) + dir = EAST; + else if (tile->west && tux->back_direction != WEST) + dir = WEST; + + if (dir != NONE) + { + tux->set_direction(dir); + 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; case GameSession::LEVEL_ABORT: // Reseting the player_status might be a worthy @@ -576,13 +700,14 @@ WorldMap::update() break; case GameSession::GAME_OVER: quit = true; + player_status.bonus = PlayerStatus::NO_BONUS; break; case GameSession::NONE: // Should never be reached break; } - play_music(song); + music_manager->play_music(song); Menu::set_current(0); if (!savegame_file.empty()) savegame(savegame_file); @@ -598,7 +723,7 @@ WorldMap::update() else { tux->set_direction(input_direction); - tux->update(0.33f); + tux->update(delta); } Menu* menu = Menu::current(); @@ -637,7 +762,7 @@ WorldMap::at(Point p) && p.y >= 0 && p.y < height); - return TileManager::instance()->get(tilemap[width * p.y + p.x]); + return tile_manager->get(tilemap[width * p.y + p.x]); } WorldMap::Level* @@ -725,42 +850,49 @@ WorldMap::display() quit = false; - song = load_song(datadir + "/music/" + music); - if(!song) - st_abort("Couldn't load song ", music.c_str()); + song = music_manager->load_music(datadir + "/music/" + music); + music_manager->play_music(song); - play_music(song); + unsigned int last_update_time; + unsigned int update_time; - 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; + last_update_time = update_time = st_get_ticks(); - if (offset.x > 0) offset.x = 0; - if (offset.y > 0) offset.y = 0; + while(!quit) + { + float delta = ((float)(update_time-last_update_time))/100.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; - } + delta *= 1.3f; - draw(offset); - get_input(); - update(); + last_update_time = update_time; + update_time = st_get_ticks(); - if(Menu::current()) - { - Menu::current()->draw(); - mouse_cursor->draw(); - } - flipscreen(); + Point tux_pos = tux->get_pos(); + if (1) + { + offset.x = -tux_pos.x + screen->w/2; + offset.y = -tux_pos.y + screen->h/2; - SDL_Delay(20); - } + 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; + } - halt_music(); - free_music(song); + draw(offset); + get_input(); + update(delta); + + if(Menu::current()) + { + Menu::current()->draw(); + mouse_cursor->draw(); + } + flipscreen(); + + SDL_Delay(20); + } } void @@ -782,8 +914,9 @@ WorldMap::savegame(const std::string& filename) << " (lives " << player_status.lives << ")\n" << " (score " << player_status.score << ")\n" << " (distros " << player_status.distros << ")\n" - << " (tux (x " << tux->get_tile_pos().x << ") (y " << tux->get_tile_pos().y << ")" - << " (back \"" << direction_to_string(tux->back_direction) << "\"))\n" + << " (tux (x " << tux->get_tile_pos().x << ") (y " << tux->get_tile_pos().y << ")\n" + << " (back \"" << direction_to_string(tux->back_direction) << "\")\n" + << " (bonus \"" << bonus_to_string(player_status.bonus) << "\"))\n" << " (levels\n"; for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) @@ -805,66 +938,78 @@ WorldMap::loadgame(const std::string& filename) std::cout << "loadgame: " << filename << std::endl; savegame_file = filename; - if (access(filename.c_str(), F_OK) == 0) + if (access(filename.c_str(), F_OK) != 0) + return; + + lisp_object_t* savegame = lisp_read_from_file(filename); + if (!savegame) { - lisp_object_t* cur = lisp_read_from_file(filename); + std::cout << "WorldMap:loadgame: File not found: " << filename << std::endl; + return; + } - if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0) - return; + lisp_object_t* cur = savegame; - cur = lisp_cdr(cur); - LispReader reader(cur); - - reader.read_int("lives", &player_status.lives); - reader.read_int("score", &player_status.score); - reader.read_int("distros", &player_status.distros); + if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0) + return; - if (player_status.lives < 0) - player_status.lives = START_LIVES; + cur = lisp_cdr(cur); + LispReader reader(cur); - lisp_object_t* tux_cur = 0; - if (reader.read_lisp("tux", &tux_cur)) - { - Point p; - std::string back_str = "none"; + reader.read_int("lives", &player_status.lives); + reader.read_int("score", &player_status.score); + reader.read_int("distros", &player_status.distros); - LispReader tux_reader(tux_cur); - tux_reader.read_int("x", &p.x); - tux_reader.read_int("y", &p.y); - tux_reader.read_string("back", &back_str); - - tux->back_direction = string_to_direction(back_str); - tux->set_tile_pos(p); - } + if (player_status.lives < 0) + player_status.lives = START_LIVES; + + lisp_object_t* tux_cur = 0; + if (reader.read_lisp("tux", &tux_cur)) + { + Point p; + std::string back_str = "none"; + std::string bonus_str = "none"; + + LispReader tux_reader(tux_cur); + tux_reader.read_int("x", &p.x); + tux_reader.read_int("y", &p.y); + tux_reader.read_string("back", &back_str); + tux_reader.read_string("bonus", &bonus_str); + + player_status.bonus = string_to_bonus(bonus_str); + tux->back_direction = string_to_direction(back_str); + tux->set_tile_pos(p); + } - lisp_object_t* level_cur = 0; - if (reader.read_lisp("levels", &level_cur)) + lisp_object_t* level_cur = 0; + if (reader.read_lisp("levels", &level_cur)) + { + while(level_cur) { - while(level_cur) - { - lisp_object_t* sym = lisp_car(lisp_car(level_cur)); - lisp_object_t* data = lisp_cdr(lisp_car(level_cur)); + lisp_object_t* sym = lisp_car(lisp_car(level_cur)); + lisp_object_t* data = lisp_cdr(lisp_car(level_cur)); - if (strcmp(lisp_symbol(sym), "level") == 0) - { - std::string name; - bool solved = false; + if (strcmp(lisp_symbol(sym), "level") == 0) + { + std::string name; + bool solved = false; - LispReader level_reader(data); - level_reader.read_string("name", &name); - level_reader.read_bool("solved", &solved); + LispReader level_reader(data); + level_reader.read_string("name", &name); + level_reader.read_bool("solved", &solved); - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) - { - if (name == i->name) - i->solved = solved; - } + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + { + if (name == i->name) + i->solved = solved; } - - level_cur = lisp_cdr(level_cur); } + + level_cur = lisp_cdr(level_cur); } } + + lisp_free(savegame); } } // namespace WorldMapNS