#include <iostream>
#include <fstream>
#include <vector>
-#include <assert.h>
+#include <cassert>
#include <unistd.h>
-#include "globals.h"
-#include "texture.h"
-#include "screen.h"
-#include "lispreader.h"
+
+#include "app/globals.h"
+#include "video/surface.h"
+#include "video/screen.h"
+#include "video/drawing_context.h"
+#include "utils/lispreader.h"
#include "gameloop.h"
-#include "setup.h"
+#include "app/setup.h"
+#include "sector.h"
#include "worldmap.h"
+#include "audio/sound_manager.h"
#include "resources.h"
+#include "app/gettext.h"
+#include "misc.h"
+
+Menu* worldmap_menu = 0;
namespace WorldMapNS {
lisp_object_t* root_obj = lisp_read_from_file(stwt_filename);
if (!root_obj)
- st_abort("Couldn't load file", stwt_filename);
+ Termination::abort("Couldn't load file", stwt_filename);
if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap-tiles") == 0)
{
tile->auto_walk = false;
LispReader reader(lisp_cdr(element));
- reader.read_int("id", &id);
- reader.read_bool("north", &tile->north);
- reader.read_bool("south", &tile->south);
- 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);
+ reader.read_int("id", id);
+ reader.read_bool("north", tile->north);
+ reader.read_bool("south", tile->south);
+ 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(
datadir + "/images/worldmap/" + filename,
- USE_ALPHA);
+ true);
if (id >= int(tiles.size()))
tiles.resize(id+1);
Tux::Tux(WorldMap* worldmap_)
: worldmap(worldmap_)
{
- 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);
+ largetux_sprite = new Surface(datadir + "/images/worldmap/tux.png", true);
+ firetux_sprite = new Surface(datadir + "/images/worldmap/firetux.png", true);
+ smalltux_sprite = new Surface(datadir + "/images/worldmap/smalltux.png", true);
offset = 0;
moving = false;
- tile_pos.x = 4;
- tile_pos.y = 5;
+ tile_pos.x = worldmap->get_start_x();
+ tile_pos.y = worldmap->get_start_y();
direction = D_NONE;
input_direction = D_NONE;
}
}
void
-Tux::draw(const Point& offset)
+Tux::draw(DrawingContext& context, const Vector& offset)
{
- Point pos = get_pos();
+ Vector pos = get_pos();
switch (player_status.bonus)
{
case PlayerStatus::GROWUP_BONUS:
- largetux_sprite->draw(pos.x + offset.x,
- pos.y + offset.y - 10);
+ context.draw_surface(largetux_sprite,
+ Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS);
break;
case PlayerStatus::FLOWER_BONUS:
- firetux_sprite->draw(pos.x + offset.x,
- pos.y + offset.y - 10);
+ context.draw_surface(firetux_sprite,
+ Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS);
break;
case PlayerStatus::NO_BONUS:
- smalltux_sprite->draw(pos.x + offset.x,
- pos.y + offset.y - 10);
+ context.draw_surface(smalltux_sprite,
+ Vector(pos.x + offset.x, pos.y + offset.y - 10), LAYER_OBJECTS);
break;
}
}
-Point
+Vector
Tux::get_pos()
{
float x = tile_pos.x * 32;
break;
}
- return Point((int)x, (int)y);
+ return Vector((int)x, (int)y);
}
void
}
void
-Tux::update(float delta)
+Tux::action(float delta)
{
if (!moving)
{
WorldMap::Level* level = worldmap->at_level();
// We got a new direction, so lets start walking when possible
- Point next_tile;
+ Vector next_tile;
if ((!level || level->solved)
&& worldmap->path_ok(input_direction, tile_pos, &next_tile))
{
}
// Walk automatically to the next tile
- Point next_tile;
+ Vector next_tile;
if (worldmap->path_ok(direction, tile_pos, &next_tile))
{
tile_pos = next_tile;
WorldMap::WorldMap()
{
tile_manager = new TileManager();
- tux = new Tux(this);
-
+ //tux = new Tux(this);
+
width = 20;
height = 15;
-
- level_sprite = new Surface(datadir + "/images/worldmap/levelmarker.png", USE_ALPHA);
- leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", USE_ALPHA);
- leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.png", USE_ALPHA);
+
+ start_x = 4;
+ start_y = 5;
+
+ level_sprite = new Surface(datadir + "/images/worldmap/levelmarker.png", true);
+ leveldot_green = new Surface(datadir + "/images/worldmap/leveldot_green.png", true);
+ leveldot_red = new Surface(datadir + "/images/worldmap/leveldot_red.png", true);
input_direction = D_NONE;
enter_level = false;
- name = "<no file>";
+ name = "<no title>";
music = "SALCON.MOD";
-
- load_map();
}
WorldMap::~WorldMap()
void
WorldMap::load_map()
{
- std::string filename = datadir + "/levels/default/worldmap.stwm";
-
- lisp_object_t* root_obj = lisp_read_from_file(filename);
+ lisp_object_t* root_obj = lisp_read_from_file(datadir + "/levels/worldmap/" + map_filename);
if (!root_obj)
- st_abort("Couldn't load file", filename);
-
+ Termination::abort("Couldn't load file", datadir + "/levels/worldmap/" + map_filename);
+
if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap") == 0)
{
lisp_object_t* cur = lisp_cdr(root_obj);
if (strcmp(lisp_symbol(lisp_car(element)), "tilemap") == 0)
{
LispReader reader(lisp_cdr(element));
- reader.read_int("width", &width);
- reader.read_int("height", &height);
- reader.read_int_vector("data", &tilemap);
+ reader.read_int("width", width);
+ reader.read_int("height", height);
+ reader.read_int_vector("data", tilemap);
}
else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
{
LispReader reader(lisp_cdr(element));
- reader.read_string("name", &name);
- reader.read_string("music", &music);
+ reader.read_string("name", name, true);
+ reader.read_string("music", music);
+ reader.read_int("start_pos_x", start_x);
+ reader.read_int("start_pos_y", start_y);
}
else if (strcmp(lisp_symbol(lisp_car(element)), "levels") == 0)
{
while(!lisp_nil_p(cur))
{
lisp_object_t* element = lisp_car(cur);
-
- if (strcmp(lisp_symbol(lisp_car(element)), "level") == 0)
+
+ if (strcmp(lisp_symbol(lisp_car(element)), "special-tile") == 0)
{
Level level;
LispReader reader(lisp_cdr(element));
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);
+ reader.read_string("extro-filename", level.extro_filename);
+ reader.read_string("map-message", level.display_map_message);
+ reader.read_string("next-world", level.next_worldmap);
+ 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);
+ level.vertical_flip = false;
+ reader.read_bool("flip-level", level.vertical_flip);
+ level.quit_worldmap = false;
+ reader.read_bool("exit-game", level.quit_worldmap);
- get_level_title(&level); // get level's title
+ levels.push_back(level);
+ }
+
+ /* Kept for backward compability */
+ else if (strcmp(lisp_symbol(lisp_car(element)), "level") == 0)
+ {
+ 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);
+ if(!level.extro_filename.empty())
+ level.quit_worldmap = true;
+ reader.read_string("name", level.name, true);
+ reader.read_int("x", level.x);
+ reader.read_int("y", level.y);
+ level.vertical_flip = false;
+ level.swap_x = level.swap_y = -1;
levels.push_back(level);
}
}
lisp_free(root_obj);
+ tux = new Tux(this);
}
-void WorldMap::get_level_title(Levels::pointer level)
+void WorldMap::get_level_title(Level& level)
{
/** get level's title */
- level->title = "<no 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);
+ level.title = "<no title>";
- 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);
+ LispReader* reader = LispReader::load(datadir + "/levels/" + level.name, "supertux-level");
+ if(!reader)
+ {
+ std::cerr << "Error: Could not open level file. Ignoring...\n";
+ return;
+ }
- fclose(fi);
+ reader->read_string("name", level.title, true);
+ delete reader;
}
void
switch(event.type)
{
case SDL_QUIT:
- st_abort("Received window close", "");
+ Termination::abort("Received window close", "");
break;
case SDL_KEYDOWN:
}
}
-Point
-WorldMap::get_next_tile(Point pos, Direction direction)
+Vector
+WorldMap::get_next_tile(Vector pos, Direction direction)
{
switch(direction)
{
}
bool
-WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos)
+WorldMap::path_ok(Direction direction, Vector old_pos, Vector* new_pos)
{
*new_pos = get_next_tile(old_pos, direction);
{
if (enter_level && !tux->is_moving())
{
+ bool level_finished = true;
Level* level = at_level();
- if (level)
+ if (!level)
+ {
+ std::cout << "Nothing to enter at: "
+ << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
+ return;
+ }
+
+
+ if(!level->name.empty())
{
if (level->x == tux->get_tile_pos().x &&
level->y == tux->get_tile_pos().y)
{
PlayerStatus old_player_status = player_status;
- std::cout << "Enter the current level: " << level->name << std::endl;;
+ std::cout << "Enter the current level: " << level->name << std::endl;
+ // do a shriking fade to the level
+ shrink_fade(Vector((level->x*32 + 16 + offset.x),(level->y*32 + 16
+ + offset.y)), 500);
GameSession session(datadir + "/levels/" + level->name,
- 1, ST_GL_LOAD_LEVEL_FILE);
+ ST_GL_LOAD_LEVEL_FILE, level->vertical_flip);
switch (session.run())
{
case GameSession::ES_LEVEL_FINISHED:
{
+ level_finished = true;
bool old_level_state = level->solved;
level->solved = true;
- if (session.get_world()->get_tux()->got_power !=
- session.get_world()->get_tux()->NONE_POWER)
+ if (session.get_current_sector()->player->got_power !=
+ session.get_current_sector()->player->NONE_POWER)
player_status.bonus = PlayerStatus::FLOWER_BONUS;
- else if (session.get_world()->get_tux()->size == BIG)
+ else if (session.get_current_sector()->player->size == BIG)
player_status.bonus = PlayerStatus::GROWUP_BONUS;
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;
std::cout << "Walk to dir: " << dir << std::endl;
}
-
- if (!level->extro_filename.empty())
- {
- MusicRef theme =
- music_manager->load_music(datadir + "/music/theme.mod");
- music_manager->play_music(theme);
- // Display final credits and go back to the main menu
- display_text_file(level->extro_filename,
- "/images/background/extro.jpg", SCROLL_SPEED_MESSAGE);
- display_text_file("CREDITS",
- "/images/background/oiltux.jpg", SCROLL_SPEED_CREDITS);
- quit = true;
- }
}
break;
case GameSession::ES_LEVEL_ABORT:
+ level_finished = false;
/* In case the player's abort the level, keep it using the old
- status */
- player_status = old_player_status;
+ status. But the minimum lives and no bonus. */
+ player_status.score = old_player_status.score;
+ player_status.distros = old_player_status.distros;
+ player_status.lives = std::min(old_player_status.lives, player_status.lives);
+ player_status.bonus = player_status.NO_BONUS;
+
break;
case GameSession::ES_GAME_OVER:
+ {
+ level_finished = false;
/* draw an end screen */
/* in the future, this should make a dialog a la SuperMario, asking
if the player wants to restart the world map with no score and from
level 1 */
char str[80];
- drawgradient(Color (0, 255, 0), Color (255, 0, 255));
+ DrawingContext context;
+ context.draw_gradient(Color (200,240,220), Color(200,200,220),
+ LAYER_BACKGROUND0);
- blue_text->drawf("GAMEOVER", 0, 200, A_HMIDDLE, A_TOP, 1);
+ context.draw_text_center(blue_text, _("GAMEOVER"),
+ Vector(0, 200), LAYER_FOREGROUND1);
- sprintf(str, "SCORE: %d", player_status.score);
- gold_text->drawf(str, 0, 224, A_HMIDDLE, A_TOP, 1);
+ sprintf(str, _("SCORE: %d"), player_status.score);
+ context.draw_text_center(gold_text, str,
+ Vector(0, 230), LAYER_FOREGROUND1);
- sprintf(str, "COINS: %d", player_status.distros);
- gold_text->drawf(str, 0, screen->w - gold_text->w*2, A_HMIDDLE, A_TOP, 1);
+ sprintf(str, _("COINS: %d"), player_status.distros);
+ context.draw_text_center(gold_text, str,
+ Vector(0, screen->w - 32), LAYER_FOREGROUND1);
- flipscreen();
+ context.do_drawing();
SDL_Event event;
wait_for_event(event,2000,5000,true);
quit = true;
player_status.reset();
break;
+ }
case GameSession::ES_NONE:
+ assert(false);
// Should never be reached
break;
}
- music_manager->play_music(song);
+ SoundManager::get()->play_music(song);
Menu::set_current(0);
if (!savegame_file.empty())
savegame(savegame_file);
- return;
}
}
- else
+ /* The porpose of the next checking is that if the player lost
+ the level (in case there is one), don't show anything */
+ if(level_finished)
{
- std::cout << "Nothing to enter at: "
- << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
+ if (!level->extro_filename.empty())
+ {
+ // Display a text file
+ display_text_file(level->extro_filename, SCROLL_SPEED_MESSAGE, white_big_text , white_text, white_small_text, blue_text );
+ }
+ if (level->swap_x != -1 && level->swap_y != -1)
+ {
+ // TODO: add an effect, like a camera scrolling, or at least, a fading
+ tux->set_tile_pos(Vector(level->swap_x, level->swap_y));
+ }
+ if (!level->next_worldmap.empty())
+ {
+ // Load given worldmap
+ loadmap(level->next_worldmap);
+ }
+ if (level->quit_worldmap)
+ quit = true;
}
}
else
{
- tux->update(delta);
+ tux->action(delta);
tux->set_direction(input_direction);
}
}
Tile*
-WorldMap::at(Point p)
+WorldMap::at(Vector p)
{
assert(p.x >= 0
&& p.x < width
&& p.y >= 0
&& p.y < height);
- return tile_manager->get(tilemap[width * p.y + p.x]);
+ int x = int(p.x);
+ int y = int(p.y);
+ return tile_manager->get(tilemap[width * y + x]);
}
WorldMap::Level*
void
-WorldMap::draw(const Point& offset)
+WorldMap::draw(DrawingContext& context, const Vector& offset)
{
for(int y = 0; y < height; ++y)
for(int x = 0; x < width; ++x)
{
- Tile* tile = at(Point(x, y));
- tile->sprite->draw(x*32 + offset.x,
- y*32 + offset.y);
+ Tile* tile = at(Vector(x, y));
+ context.draw_surface(tile->sprite,
+ Vector(x*32 + offset.x, y*32 + offset.y), LAYER_TILES);
}
for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
{
+ if(i->name.empty())
+ continue;
+
if (i->solved)
- leveldot_green->draw(i->x*32 + offset.x,
- i->y*32 + offset.y);
+ context.draw_surface(leveldot_green,
+ Vector(i->x*32 + offset.x, i->y*32 + offset.y), LAYER_TILES+1);
else
- leveldot_red->draw(i->x*32 + offset.x,
- i->y*32 + offset.y);
+ context.draw_surface(leveldot_red,
+ Vector(i->x*32 + offset.x, i->y*32 + offset.y), LAYER_TILES+1);
}
- tux->draw(offset);
- draw_status();
+ tux->draw(context, offset);
+ draw_status(context);
}
void
-WorldMap::draw_status()
+WorldMap::draw_status(DrawingContext& context)
{
char str[80];
- sprintf(str, "%d", player_status.score);
- white_text->draw("SCORE", 0, 0);
- gold_text->draw(str, 96, 0);
+ sprintf(str, " %d", player_status.score);
+
+ context.draw_text(white_text, _("SCORE"), Vector(0, 0), LAYER_FOREGROUND1);
+ context.draw_text(gold_text, str, Vector(96, 0), LAYER_FOREGROUND1);
sprintf(str, "%d", player_status.distros);
- white_text->draw_align("COINS", screen->w/2 - white_text->w*5, 0, A_LEFT, A_TOP);
- gold_text->draw_align(str, screen->w/2 + (white_text->w*5)/2, 0, A_RIGHT, A_TOP);
+ context.draw_text(white_text, _("COINS"), Vector(screen->w/2 - 16*5, 0),
+ LAYER_FOREGROUND1);
+ context.draw_text(gold_text, str, Vector(screen->w/2 + (16*5)/2, 0),
+ LAYER_FOREGROUND1);
- white_text->draw("LIVES", screen->w - white_text->w*9, 0);
if (player_status.lives >= 5)
{
sprintf(str, "%dx", player_status.lives);
- gold_text->draw_align(str, screen->w - gold_text->w, 0, A_RIGHT, A_TOP);
- tux_life->draw(screen->w - gold_text->w, 0);
+ context.draw_text(gold_text, str,
+ Vector(screen->w - gold_text->get_text_width(str) - tux_life->w, 0),
+ LAYER_FOREGROUND1);
+ context.draw_surface(tux_life, Vector(screen->w -
+ gold_text->get_text_width("9"), 0), LAYER_FOREGROUND1);
}
else
{
for(int i= 0; i < player_status.lives; ++i)
- tux_life->draw(screen->w - tux_life->w*4 +(tux_life->w*i),0);
+ context.draw_surface(tux_life,
+ Vector(screen->w - tux_life->w*4 + (tux_life->w*i), 0),
+ LAYER_FOREGROUND1);
}
+ context.draw_text(white_text, _("LIVES"),
+ Vector(screen->w - white_text->get_text_width(_("LIVES")) - white_text->get_text_width(" 99"), 0),
+ LAYER_FOREGROUND1);
if (!tux->is_moving())
{
if (i->x == tux->get_tile_pos().x &&
i->y == tux->get_tile_pos().y)
{
- white_text->draw_align(i->title.c_str(), screen->w/2, screen->h, A_HMIDDLE, A_BOTTOM);
+ if(!i->name.empty())
+ {
+ if(i->title == "")
+ get_level_title(*i);
+
+ context.draw_text_center(white_text, i->title,
+ Vector(0, screen->h - white_text->get_height() - 30),
+ LAYER_FOREGROUND1);
+ }
+
+ /* Display a message in the map, if any as been selected */
+ if(!i->display_map_message.empty())
+ context.draw_text_center(gold_text, i->display_map_message,
+ Vector(0, screen->h - white_text->get_height() - 60),
+ LAYER_FOREGROUND1);
break;
}
}
quit = false;
- song = music_manager->load_music(datadir + "/music/" + music);
- music_manager->play_music(song);
-
+ song = SoundManager::get()->load_music(datadir + "/music/" + music);
+ SoundManager::get()->play_music(song);
+
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)
{
float delta = ((float)(update_time-last_update_time))/100.0;
delta = .3f;
last_update_time = update_time;
- update_time = st_get_ticks();
+ update_time = Ticks::get();
- Point tux_pos = tux->get_pos();
+ Vector tux_pos = tux->get_pos();
if (1)
{
offset.x = -tux_pos.x + screen->w/2;
if (offset.y < screen->h - height*32) offset.y = screen->h - height*32;
}
- draw(offset);
+ draw(context, offset);
get_input();
update(delta);
if(Menu::current())
{
- Menu::current()->draw();
- mouse_cursor->draw();
+ Menu::current()->draw(context);
+ mouse_cursor->draw(context);
}
- flipscreen();
+
+ context.do_drawing();
SDL_Delay(20);
}
void
WorldMap::savegame(const std::string& filename)
{
+ if(filename != "")
+ return;
+
std::cout << "savegame: " << filename << std::endl;
std::ofstream out(filename.c_str());
out << "(supertux-savegame\n"
<< " (version 1)\n"
- << " (title \"Icyisland - " << nb_solved_levels << "/" << levels.size() << "\")\n"
+ << " (title \"" << name << " - " << nb_solved_levels << "/" << levels.size() << "\")\n"
+ << " (map \"" << map_filename << "\")\n"
<< " (lives " << player_status.lives << ")\n"
<< " (score " << player_status.score << ")\n"
<< " (distros " << player_status.distros << ")\n"
{
std::cout << "loadgame: " << filename << std::endl;
savegame_file = filename;
+ map_filename = "icyisland.stwm";
if (access(filename.c_str(), F_OK) != 0)
+ {
+ load_map();
return;
+ }
lisp_object_t* savegame = lisp_read_from_file(filename);
if (!savegame)
{
std::cout << "WorldMap:loadgame: File not found: " << filename << std::endl;
+ load_map();
return;
}
lisp_object_t* cur = savegame;
if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0)
+ {
+ load_map();
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);
+ /* Get the Map filename and then load it before setting level settings */
+ reader.read_string("map", map_filename);
+ load_map();
+
+ 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))
+ if (reader.read_lisp("tux", tux_cur))
{
- Point p;
+ Vector 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);
+ tux_reader.read_float("x", p.x);
+ tux_reader.read_float("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);
}
lisp_object_t* level_cur = 0;
- if (reader.read_lisp("levels", &level_cur))
+ if (reader.read_lisp("levels", level_cur))
{
while(level_cur)
{
bool solved = false;
LispReader level_reader(data);
- level_reader.read_string("name", &name);
- level_reader.read_bool("solved", &solved);
+ level_reader.read_string("name", name, true);
+ level_reader.read_bool("solved", solved);
for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
{
lisp_free(savegame);
}
+void
+WorldMap::loadmap(const std::string& filename)
+{
+ savegame_file = "";
+ map_filename = filename;
+ load_map();
+}
+
} // namespace WorldMapNS
/* Local Variables: */
projects / supertux.git / blobdiff