X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=961b637136629a128847a0113b784040176b2153;hb=e153dbd4e932d55775a898ed3055e50ea3ac3542;hp=f6098b5ec13c32a28e81c826008000a68d13e4b3;hpb=997685a947eaa0b269873e5956908b734cde1d76;p=supertux.git diff --git a/src/worldmap.cpp b/src/worldmap.cpp index f6098b5ec..961b63713 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -28,14 +28,64 @@ #include "gameloop.h" #include "setup.h" #include "worldmap.h" +#include "resources.h" namespace WorldMapNS { -TileManager* TileManager::instance_ = 0; +Direction reverse_dir(Direction direction) +{ + switch(direction) + { + case WEST: + return EAST; + case EAST: + return WEST; + case NORTH: + return SOUTH; + case SOUTH: + return NORTH; + case NONE: + return NONE; + } + return NONE; +} + +std::string +direction_to_string(Direction direction) +{ + switch(direction) + { + case WEST: + return "west"; + case EAST: + return "east"; + case NORTH: + return "north"; + case SOUTH: + return "south"; + default: + return "none"; + } +} + +Direction +string_to_direction(const std::string& directory) +{ + if (directory == "west") + return WEST; + else if (directory == "east") + return EAST; + else if (directory == "north") + return NORTH; + else if (directory == "south") + return SOUTH; + else + return NONE; +} 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) @@ -60,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); @@ -68,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( @@ -91,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* @@ -100,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; + } } @@ -162,13 +247,26 @@ Tux::update(float delta) if (!moving) { if (input_direction != NONE) - { // We got a new direction, so lets start walking when possible + { + WorldMap::Level* level = worldmap->at_level(); + + // We got a new direction, so lets start walking when possible Point next_tile; - if (worldmap->path_ok(input_direction, tile_pos, &next_tile)) + if ((!level || level->solved) + && worldmap->path_ok(input_direction, tile_pos, &next_tile)) { tile_pos = next_tile; moving = true; direction = input_direction; + back_direction = reverse_dir(direction); + } + else if (input_direction == back_direction) + { + std::cout << "Back triggered" << std::endl; + moving = true; + direction = input_direction; + tile_pos = worldmap->get_next_tile(tile_pos, direction); + back_direction = reverse_dir(direction); } } } @@ -181,12 +279,40 @@ Tux::update(float delta) { // We reached the next tile, so we check what to do now offset -= 32; - if (worldmap->at(tile_pos)->stop) + if (worldmap->at(tile_pos)->stop || worldmap->at_level()) { stop(); } 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)) { @@ -202,11 +328,23 @@ Tux::update(float delta) } } +//--------------------------------------------------------------------------- +Tile::Tile() +{ +} + +Tile::~Tile() +{ + delete sprite; +} + +//--------------------------------------------------------------------------- + WorldMap::WorldMap() { + tile_manager = new TileManager(); tux = new Tux(this); - quit = false; width = 20; height = 15; @@ -217,9 +355,8 @@ WorldMap::WorldMap() input_direction = NONE; enter_level = false; - name = ""; + name = ""; music = "SALCON.MOD"; - song = 0; load_map(); } @@ -227,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) @@ -272,9 +414,19 @@ WorldMap::load_map() Level level; LispReader reader(lisp_cdr(element)); level.solved = false; + + level.north = true; + level.east = true; + 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); + + get_level_title(&level); // get level's title + levels.push_back(level); } @@ -289,6 +441,52 @@ 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 = ""; + + 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; + } + + 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) + { + printf("World: Parse Error in file %s", level->name.c_str()); + } + + if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0) + { + LispReader reader(lisp_cdr(root_obj)); + reader.read_string("name", &level->title); + } + + lisp_free(root_obj); + + fclose(fi); +} + +void +WorldMap::on_escape_press() +{ + // Show or hide the menu + if(!Menu::current()) + Menu::set_current(worldmap_menu); + else + Menu::set_current(0); } void @@ -300,24 +498,23 @@ WorldMap::get_input() SDL_Event event; while (SDL_PollEvent(&event)) { - if(show_menu) + if (Menu::current()) { - current_menu->event(event); + Menu::current()->event(event); } else { switch(event.type) { case SDL_QUIT: - quit = true; + st_abort("Received window close", ""); break; case SDL_KEYDOWN: switch(event.key.keysym.sym) { case SDLK_ESCAPE: - Menu::set_current(worldmap_menu); - show_menu = !show_menu; + on_escape_press(); break; case SDLK_LCTRL: case SDLK_RETURN: @@ -329,26 +526,27 @@ WorldMap::get_input() break; case SDL_JOYAXISMOTION: - switch(event.jaxis.axis) + if (event.jaxis.axis == joystick_keymap.x_axis) { - case JOY_X: - if (event.jaxis.value < -JOYSTICK_DEAD_ZONE) + if (event.jaxis.value < -joystick_keymap.dead_zone) input_direction = WEST; - else if (event.jaxis.value > JOYSTICK_DEAD_ZONE) + else if (event.jaxis.value > joystick_keymap.dead_zone) input_direction = EAST; - break; - case JOY_Y: - if (event.jaxis.value > JOYSTICK_DEAD_ZONE) + } + else if (event.jaxis.axis == joystick_keymap.y_axis) + { + if (event.jaxis.value > joystick_keymap.dead_zone) input_direction = SOUTH; - else if (event.jaxis.value < -JOYSTICK_DEAD_ZONE) + else if (event.jaxis.value < -joystick_keymap.dead_zone) input_direction = NORTH; - break; } break; case SDL_JOYBUTTONDOWN: - if (event.jbutton.button == JOY_B) + if (event.jbutton.button == joystick_keymap.b_button) enter_level = true; + else if (event.jbutton.button == joystick_keymap.start_button) + on_escape_press(); break; default: @@ -357,7 +555,7 @@ WorldMap::get_input() } } - if (!show_menu) + if (!Menu::current()) { Uint8 *keystate = SDL_GetKeyState(NULL); @@ -429,54 +627,130 @@ WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos) } void -WorldMap::update() +WorldMap::update(float delta) { if (enter_level && !tux->is_moving()) { - for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + Level* level = at_level(); + if (level) { - if (i->x == tux->get_tile_pos().x && - i->y == tux->get_tile_pos().y) + if (level->x == tux->get_tile_pos().x && + level->y == tux->get_tile_pos().y) { - std::cout << "Enter the current level: " << i->name << std::endl;; - halt_music(); - GameSession session(datadir + "levels/" + i->name, + std::cout << "Enter the current level: " << level->name << std::endl;; + GameSession session(datadir + "/levels/" + level->name, 1, ST_GL_LOAD_LEVEL_FILE); - session.run(); - if (1) // FIXME: insert exit status checker here - i->solved = true; + switch (session.run()) + { + case GameSession::LEVEL_FINISHED: + { + 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 + // consideration, but I don't think we need it + // 'cause only the bad players will use it to + // 'cheat' a few items and that isn't necesarry a + // bad thing (ie. better they continue that way, + // then stop playing the game all together since it + // is to hard) + 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, 1); - show_menu = 0; - menu_reset(); - savegame(std::string(st_save_dir) + "/slot1.stsg"); + music_manager->play_music(song); + Menu::set_current(0); + if (!savegame_file.empty()) + savegame(savegame_file); return; } } - std::cout << "Nothing to enter at: " - << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl; + else + { + std::cout << "Nothing to enter at: " + << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl; + } } else { tux->set_direction(input_direction); - tux->update(0.33f); + tux->update(delta); } - if(show_menu) + Menu* menu = Menu::current(); + if(menu) { - if(current_menu == worldmap_menu) + menu->action(); + + if(menu == worldmap_menu) { switch (worldmap_menu->check()) { - case 2: // Return to game - menu_reset(); + case MNID_RETURNWORLDMAP: // Return to game break; - case 5: // Quit Worldmap + case MNID_SAVEGAME: + if (!savegame_file.empty()) + savegame(savegame_file); + break; + + case MNID_QUITWORLDMAP: // Quit Worldmap quit = true; break; } } + else if(menu == options_menu) + { + process_options_menu(); + } } } @@ -487,9 +761,24 @@ WorldMap::at(Point p) && p.x < width && 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* +WorldMap::at_level() +{ + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + { + if (i->x == tux->get_tile_pos().x && + i->y == tux->get_tile_pos().y) + return &*i; + } + + return 0; } + void WorldMap::draw(const Point& offset) { @@ -503,8 +792,12 @@ WorldMap::draw(const Point& offset) for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { - leveldot_green->draw(i->x*32 + offset.x, - i->y*32 + offset.y); + if (i->solved) + leveldot_green->draw(i->x*32 + offset.x, + i->y*32 + offset.y); + else + leveldot_red->draw(i->x*32 + offset.x, + i->y*32 + offset.y); } tux->draw(offset); @@ -543,7 +836,7 @@ WorldMap::draw_status() if (i->x == tux->get_tile_pos().x && i->y == tux->get_tile_pos().y) { - white_text->draw_align(i->name.c_str(), screen->w/2, screen->h, A_HMIDDLE, A_BOTTOM); + white_text->draw_align(i->title.c_str(), screen->w/2, screen->h, A_HMIDDLE, A_BOTTOM); break; } } @@ -553,52 +846,77 @@ WorldMap::draw_status() void WorldMap::display() { - show_menu = 0; - menu_reset(); + Menu::set_current(0); quit = false; - song = load_song(datadir + "/music/" + music); - play_music(song, 1); + 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; - menu_process_current(); - 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; + } - free_music(song); + draw(offset); + get_input(); + update(delta); + + if(Menu::current()) + { + Menu::current()->draw(); + mouse_cursor->draw(); + } + flipscreen(); + + SDL_Delay(20); + } } void WorldMap::savegame(const std::string& filename) { + std::cout << "savegame: " << filename << std::endl; std::ofstream out(filename.c_str()); + int nb_solved_levels = 0; + for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) + { + if (i->solved) + ++nb_solved_levels; + } + out << "(supertux-savegame\n" << " (version 1)\n" + << " (title \"Icyisland - " << nb_solved_levels << "/" << levels.size() << "\")\n" << " (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 << ")\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) @@ -614,13 +932,89 @@ WorldMap::savegame(const std::string& filename) << " )\n\n;; EOF ;;" << std::endl; } -} // namespace WorldMapNS - -void worldmap_run() +void +WorldMap::loadgame(const std::string& filename) { - WorldMapNS::WorldMap worldmap; + std::cout << "loadgame: " << filename << std::endl; + savegame_file = filename; + + if (access(filename.c_str(), F_OK) != 0) + return; - worldmap.display(); + 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) + return; + + 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 (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)) + { + while(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; + + 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; + } + } + + level_cur = lisp_cdr(level_cur); + } + } + + lisp_free(savegame); } -/* EOF */ +} // namespace WorldMapNS + +/* Local Variables: */ +/* mode:c++ */ +/* End: */ +