#include <stdexcept>
#include <sstream>
#include <unistd.h>
-
-#include "gettext.h"
-#include "video/surface.h"
-#include "video/screen.h"
-#include "video/drawing_context.h"
-#include "sprite/sprite_manager.h"
-#include "audio/sound_manager.h"
-#include "lisp/parser.h"
-#include "lisp/lisp.h"
-#include "lisp/list_iterator.h"
-#include "lisp/writer.h"
-#include "game_session.h"
-#include "sector.h"
-#include "worldmap.h"
-#include "resources.h"
-#include "misc.h"
-#include "player_status.h"
-#include "textscroller.h"
-#include "main.h"
-#include "spawn_point.h"
-#include "file_system.h"
-#include "gui/menu.h"
-#include "gui/mousecursor.h"
-#include "control/joystickkeyboardcontroller.h"
-#include "object/background.h"
-#include "object/tilemap.h"
-#include "scripting/script_interpreter.h"
+#include <physfs.h>
+
+#include "gettext.hpp"
+#include "video/surface.hpp"
+#include "video/screen.hpp"
+#include "video/drawing_context.hpp"
+#include "sprite/sprite_manager.hpp"
+#include "audio/sound_manager.hpp"
+#include "lisp/parser.hpp"
+#include "lisp/lisp.hpp"
+#include "lisp/list_iterator.hpp"
+#include "lisp/writer.hpp"
+#include "game_session.hpp"
+#include "sector.hpp"
+#include "worldmap.hpp"
+#include "resources.hpp"
+#include "misc.hpp"
+#include "player_status.hpp"
+#include "textscroller.hpp"
+#include "main.hpp"
+#include "spawn_point.hpp"
+#include "file_system.hpp"
+#include "gui/menu.hpp"
+#include "gui/mousecursor.hpp"
+#include "control/joystickkeyboardcontroller.hpp"
+#include "object/background.hpp"
+#include "object/tilemap.hpp"
+#include "scripting/script_interpreter.hpp"
+#include "exceptions.hpp"
Menu* worldmap_menu = 0;
Tux::Tux(WorldMap* worldmap_)
: worldmap(worldmap_)
{
- tux_sprite = sprite_manager->create("worldmaptux");
+ tux_sprite = sprite_manager->create("images/worldmap/common/tux.sprite");
offset = 0;
moving = false;
void
Tux::draw(DrawingContext& context)
{
- switch (player_status.bonus) {
+ switch (player_status->bonus) {
case GROWUP_BONUS:
- tux_sprite->set_action("large");
+ tux_sprite->set_action(moving ? "large-walking" : "large-stop");
break;
case FIRE_BONUS:
- tux_sprite->set_action("fire");
+ tux_sprite->set_action(moving ? "fire-walking" : "fire-stop");
break;
case NO_BONUS:
- tux_sprite->set_action("small");
+ tux_sprite->set_action(moving ? "small-walking" : "small-stop");
break;
default:
-#ifdef DBEUG
+#ifdef DEBUG
std::cerr << "Bonus type not handled in worldmap.\n";
#endif
- tux_sprite->set_action("large");
+ tux_sprite->set_action("large-stop");
break;
}
tux = new Tux(this);
add_object(tux);
- leveldot_green= new Surface("images/tiles/worldmap/leveldot_green.png", true);
- leveldot_red = new Surface("images/tiles/worldmap/leveldot_red.png", true);
- messagedot = new Surface("images/tiles/worldmap/messagedot.png", true);
- teleporterdot = new Surface("images/tiles/worldmap/teleporterdot.png", true);
+ messagedot = new Surface("images/worldmap/common/messagedot.png");
+ teleporterdot = new Surface("images/worldmap/common/teleporterdot.png");
name = "<no title>";
- music = "salcon.mod";
+ music = "music/salcon.ogg";
intro_displayed = false;
total_stats.reset();
i != spawn_points.end(); ++i) {
delete *i;
}
-
+ for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) {
+ Level& level = *i;
+ delete level.sprite;
+ }
+
delete tile_manager;
- delete leveldot_green;
- delete leveldot_red;
delete messagedot;
delete teleporterdot;
}
level.south = true;
level.west = true;
+ std::string sprite = "images/worldmap/common/leveldot.sprite";
+ level_lisp->get("sprite", sprite);
+ level.sprite = sprite_manager->create(sprite);
+
level_lisp->get("extro-script", level.extro_script);
level_lisp->get("next-worldmap", level.next_worldmap);
level_lisp->get("quit-worldmap", level.quit_worldmap);
level_lisp->get("name", level.name);
+
+ if (!PHYSFS_exists((levels_path + level.name).c_str()))
+ {
+ // Do we want to bail out instead...? We might get messages from modders
+ // who can't make their levels run because they're too dumb to watch
+ // their terminals...
+ std::cerr << "Error: level file '" << level.name
+ << "' does not exist and will not be added to the worldmap." << std::endl;
+ return;
+ }
+
level_lisp->get("x", level.pos.x);
level_lisp->get("y", level.pos.y);
Menu::current()->event(event);
main_controller->process_event(event);
if(event.type == SDL_QUIT)
- throw std::runtime_error("Received window close");
+ throw graceful_shutdown();
}
}
if (special_tile->teleport_dest != Vector(-1,-1))
{
// TODO: an animation, camera scrolling or a fading would be a nice touch
- sound_manager->play_sound("warp");
+ sound_manager->play("sounds/warp.wav");
tux->back_direction = D_NONE;
tux->set_tile_pos(special_tile->teleport_dest);
SDL_Delay(1000);
if (level->pos == tux->get_tile_pos())
{
- PlayerStatus old_player_status = player_status;
+ sound_manager->stop_music();
+ PlayerStatus old_player_status;
+ old_player_status = *player_status;
// do a shriking fade to the level
shrink_fade(Vector((level->pos.x*32 + 16 + offset.x),
level_finished = true;
bool old_level_state = level->solved;
level->solved = true;
+ level->sprite->set_action("solved");
// deal with statistics
level->statistics.merge(global_stats);
level_finished = false;
/* In case the player's abort the level, keep it using the old
status. But the minimum lives and no bonus. */
- player_status.coins = old_player_status.coins;
- player_status.lives = std::min(old_player_status.lives, player_status.lives);
- player_status.bonus = NO_BONUS;
+ player_status->coins = old_player_status.coins;
+ player_status->lives = std::min(old_player_status.lives, player_status->lives);
+ player_status->bonus = NO_BONUS;
break;
case GameSession::ES_GAME_OVER:
context.draw_text(blue_text, _("GAMEOVER"),
Vector(SCREEN_WIDTH/2, 200), CENTER_ALLIGN, LAYER_FOREGROUND1);
- sprintf(str, _("COINS: %d"), player_status.coins);
+ sprintf(str, _("COINS: %d"), player_status->coins);
context.draw_text(gold_text, str,
Vector(SCREEN_WIDTH/2, SCREEN_WIDTH - 32), CENTER_ALLIGN,
LAYER_FOREGROUND1);
wait_for_event(2.0, 6.0);
quit = true;
- player_status.reset();
+ player_status->reset();
break;
}
case GameSession::ES_NONE:
break;
}
- sound_manager->play_music(song);
+ sound_manager->play_music(music);
Menu::set_current(0);
if (!savegame_file.empty())
savegame(savegame_file);
for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
{
- if (i->solved)
- context.draw_surface(leveldot_green,
- Vector(i->pos.x*32, i->pos.y*32), LAYER_TILES+1);
- else
- context.draw_surface(leveldot_red,
- Vector(i->pos.x*32, i->pos.y*32), LAYER_TILES+1);
+ const Level& level = *i;
+ level.sprite->draw(context, level.pos*32 + Vector(16, 16), LAYER_TILES+1);
}
for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
context.push_transform();
context.set_translation(Vector(0, 0));
- player_status.draw(context);
+ player_status->draw(context);
if (!tux->is_moving())
{
quit = false;
- song = sound_manager->load_music("music/" + music);
- sound_manager->play_music(song);
+ sound_manager->play_music(music);
if(!intro_displayed && intro_script != "") {
try {
while(!quit) {
Uint32 ticks = SDL_GetTicks();
float elapsed_time = float(ticks - lastticks) / 1000;
- global_time += elapsed_time;
+ game_time += elapsed_time;
lastticks = ticks;
// 40 fps minimum // TODO use same code as in GameSession here
context.pop_transform();
get_input();
update(elapsed_time);
+ sound_manager->update();
if(Menu::current()) {
Menu::current()->draw(context);
if(filename == "")
return;
+ std::string dir = FileSystem::dirname(filename);
+ if(PHYSFS_exists(dir.c_str()) == 0 && PHYSFS_mkdir(dir.c_str()) != 0) {
+ std::ostringstream msg;
+ msg << "Couldn't create directory '" << dir << "' for savegame:"
+ << PHYSFS_getLastError();
+ throw std::runtime_error(msg.str());
+ }
+ if(!PHYSFS_isDirectory(dir.c_str())) {
+ std::ostringstream msg;
+ msg << "'" << dir << "' is not a directory.";
+ throw std::runtime_error(msg.str());
+ }
+
lisp::Writer writer(filename);
int nb_solved_levels = 0, total_levels = 0;
writer.write_float("x", tux->get_tile_pos().x);
writer.write_float("y", tux->get_tile_pos().y);
writer.write_string("back", direction_to_string(tux->back_direction));
- player_status.write(writer);
+ player_status->write(writer);
writer.write_string("back", direction_to_string(tux->back_direction));
writer.end_list("tux");
{
std::cout << "loadgame: " << filename << std::endl;
savegame_file = filename;
-
- try {
- lisp::Parser parser;
- std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
- const lisp::Lisp* savegame = root->get_lisp("supertux-savegame");
- if(!savegame)
- throw std::runtime_error("File is not a supertux-savegame file.");
-
- /* Get the Map filename and then load it before setting level settings */
- std::string cur_map_filename = map_filename;
- savegame->get("map", map_filename);
- load_map();
-
- savegame->get("intro-displayed", intro_displayed);
- savegame->get("lives", player_status.lives);
- savegame->get("coins", player_status.coins);
- savegame->get("max-score-multiplier", player_status.max_score_multiplier);
- if (player_status.lives < 0)
- player_status.reset();
-
- const lisp::Lisp* tux_lisp = savegame->get_lisp("tux");
- if(tux)
- {
- Vector p;
- std::string back_str = "none";
+ if (PHYSFS_exists(filename.c_str())) // savegame exists
+ {
+ try {
+ lisp::Parser parser;
+
+ std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+
+ const lisp::Lisp* savegame = root->get_lisp("supertux-savegame");
+ if(!savegame)
+ throw std::runtime_error("File is not a supertux-savegame file.");
+
+ /* Get the Map filename and then load it before setting level settings */
+ std::string cur_map_filename = map_filename;
+ savegame->get("map", map_filename);
+ load_map();
+
+ savegame->get("intro-displayed", intro_displayed);
+ savegame->get("lives", player_status->lives);
+ savegame->get("coins", player_status->coins);
+ savegame->get("max-score-multiplier", player_status->max_score_multiplier);
+ if (player_status->lives < 0)
+ player_status->reset();
+
+ const lisp::Lisp* tux_lisp = savegame->get_lisp("tux");
+ if(tux)
+ {
+ Vector p;
+ std::string back_str = "none";
- tux_lisp->get("x", p.x);
- tux_lisp->get("y", p.y);
- tux_lisp->get("back", back_str);
- player_status.read(*tux_lisp);
+ tux_lisp->get("x", p.x);
+ tux_lisp->get("y", p.y);
+ tux_lisp->get("back", back_str);
+ player_status->read(*tux_lisp);
- tux->back_direction = string_to_direction(back_str);
- tux->set_tile_pos(p);
- }
+ tux->back_direction = string_to_direction(back_str);
+ tux->set_tile_pos(p);
+ }
- const lisp::Lisp* levels_lisp = savegame->get_lisp("levels");
- if(levels_lisp) {
- lisp::ListIterator iter(levels_lisp);
- while(iter.next()) {
- if(iter.item() == "level") {
- std::string name;
- bool solved = false;
+ const lisp::Lisp* levels_lisp = savegame->get_lisp("levels");
+ if(levels_lisp) {
+ lisp::ListIterator iter(levels_lisp);
+ while(iter.next()) {
+ if(iter.item() == "level") {
+ std::string name;
+ bool solved = false;
- const lisp::Lisp* level = iter.lisp();
- level->get("name", name);
- level->get("solved", solved);
+ const lisp::Lisp* level = iter.lisp();
+ level->get("name", name);
+ level->get("solved", solved);
- for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
- {
- if (name == i->name)
+ for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
{
- i->solved = solved;
- i->statistics.parse(*level);
- break;
+ if (name == i->name)
+ {
+ i->solved = solved;
+ i->sprite->set_action(solved ? "solved" : "default");
+ i->statistics.parse(*level);
+ break;
+ }
}
+ } else {
+ std::cerr << "Unknown token '" << iter.item()
+ << "' in levels block in worldmap.\n";
}
- } else {
- std::cerr << "Unknown token '" << iter.item()
- << "' in levels block in worldmap.\n";
}
}
+ } catch(std::exception& e) {
+ std::cerr << "Problem loading game '" << filename << "': " << e.what()
+ << "\n";
+ load_map();
+ player_status->reset();
}
- } catch(std::exception& e) {
- std::cerr << "Problem loading game '" << filename << "': " << e.what()
- << "\n";
- load_map();
- player_status.reset();
+ }
+ else
+ {
+ load_map();
+ player_status->reset();
}
calculate_total_stats();
projects / supertux.git / blobdiff