#include "lispreader.h"
#include "gameloop.h"
#include "setup.h"
+#include "sector.h"
#include "worldmap.h"
+#include "sound_manager.h"
#include "resources.h"
+#include "gettext.h"
namespace WorldMapNS {
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,
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);
+ reader.read_string("music", music);
}
else if (strcmp(lisp_symbol(lisp_car(element)), "levels") == 0)
{
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("name", level.name);
+ reader.read_int("x", level.x);
+ reader.read_int("y", level.y);
levels.push_back(level);
}
if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-level") == 0)
{
LispReader reader(lisp_cdr(root_obj));
- reader.read_string("name", &level.title);
+ reader.read_string("name", level.title);
}
lisp_free(root_obj);
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);
switch (session.run())
{
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 (!level->extro_filename.empty())
{
MusicRef theme =
- music_manager->load_music(datadir + "/music/theme.mod");
- music_manager->play_music(theme);
+ sound_manager->load_music(datadir + "/music/theme.mod");
+ sound_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);
context.draw_gradient(Color (0, 255, 0), Color (255, 0, 255),
LAYER_BACKGROUND0);
- context.draw_text_center(blue_text, "GAMEOVER",
+ context.draw_text_center(blue_text, _("GAMEOVER"),
Vector(0, 200), LAYER_FOREGROUND1);
- sprintf(str, "SCORE: %d", player_status.score);
+ sprintf(str, _("SCORE: %d"), player_status.score);
context.draw_text_center(gold_text, str,
Vector(0, 224), LAYER_FOREGROUND1);
- sprintf(str, "COINS: %d", player_status.distros);
+ sprintf(str, _("COINS: %d"), player_status.distros);
context.draw_text_center(gold_text, str,
Vector(0, screen->w - 32), LAYER_FOREGROUND1);
break;
}
- music_manager->play_music(song);
+ sound_manager->play_music(song);
Menu::set_current(0);
if (!savegame_file.empty())
savegame(savegame_file);
void
WorldMap::draw_status(DrawingContext& context)
{
- context.push_transform();
- context.set_translation(Vector(0, 0));
-
char str[80];
- sprintf(str, "%d", player_status.score);
+ sprintf(str, " %d", player_status.score);
- context.draw_text(white_text, "SCORE", Vector(0, 0), LAYER_FOREGROUND1);
+ 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);
- context.draw_text(white_text, "COINS", Vector(screen->w/2 - 16*5, 0),
+ 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);
- context.draw_text(white_text, "LIVES",
- Vector(screen->w - white_text->get_text_width("LIVES")*2, 0),
- LAYER_FOREGROUND1);
if (player_status.lives >= 5)
{
sprintf(str, "%dx", player_status.lives);
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->w, 0),
- LAYER_FOREGROUND1);
+ context.draw_surface(tux_life, Vector(screen->w -
+ gold_text->get_text_width("9"), 0), LAYER_FOREGROUND1);
}
else
{
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())
{
context.draw_text(white_text, i->title,
Vector(screen->w/2 - white_text->get_text_width(i->title)/2,
- screen->h - white_text->get_height() - 50),
+ screen->h - white_text->get_height() - 30),
LAYER_FOREGROUND1);
break;
}
quit = false;
- song = music_manager->load_music(datadir + "/music/" + music);
- music_manager->play_music(song);
+ song = sound_manager->load_music(datadir + "/music/" + music);
+ sound_manager->play_music(song);
unsigned int last_update_time;
unsigned int update_time;
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);
+ 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))
{
Vector p;
std::string back_str = "none";
std::string bonus_str = "none";
LispReader tux_reader(tux_cur);
- 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);
+ 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);
+ level_reader.read_bool("solved", solved);
for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
{
projects / supertux.git / blobdiff