#include <iostream>
#include <fstream>
#include <vector>
-#include <assert.h>
+#include <cassert>
#include <unistd.h>
-#include "globals.h"
-#include "screen/texture.h"
-#include "screen/screen.h"
-#include "screen/drawing_context.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 "sound_manager.h"
+#include "audio/sound_manager.h"
#include "resources.h"
-#include "gettext.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->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;
}
{
offset = 0;
direction = D_NONE;
+ input_direction = D_NONE;
moving = false;
}
void
+Tux::set_direction(Direction dir)
+{
+input_direction = dir;
+}
+
+void
Tux::action(float delta)
{
if (!moving)
{
if (input_direction != D_NONE)
{
- WorldMap::Level* level = worldmap->at_level();
+ WorldMap::SpecialTile* special_tile = worldmap->at_special_tile();
// We got a new direction, so lets start walking when possible
Vector next_tile;
- if ((!level || level->solved)
+ if ((!special_tile || special_tile->solved || special_tile->level_name.empty())
&& worldmap->path_ok(input_direction, tile_pos, &next_tile))
{
tile_pos = next_tile;
}
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);
{ // We reached the next tile, so we check what to do now
offset -= 32;
- if (worldmap->at(tile_pos)->stop || worldmap->at_level())
+ if (worldmap->at(tile_pos)->stop || worldmap->at_special_tile())
{
stop();
}
else
{
- if (worldmap->at(tile_pos)->auto_walk)
+ if (worldmap->at(tile_pos)->auto_walk || direction != input_direction)
{ // Turn to a new direction
Tile* tile = worldmap->at(tile_pos);
- Direction dir = D_NONE;
-
- if (tile->north && back_direction != D_NORTH)
- dir = D_NORTH;
- else if (tile->south && back_direction != D_SOUTH)
- dir = D_SOUTH;
- else if (tile->east && back_direction != D_EAST)
- dir = D_EAST;
- else if (tile->west && back_direction != D_WEST)
- dir = D_WEST;
-
- if (dir != D_NONE)
- {
- direction = dir;
+
+ if(direction != input_direction &&
+ ((tile->north && input_direction == D_NORTH) ||
+ (tile->south && input_direction == D_SOUTH) ||
+ (tile->east && input_direction == D_EAST) ||
+ (tile->west && input_direction == D_WEST)))
+ { // player has changed direction during auto-movement
+ direction = input_direction;
+ back_direction = reverse_dir(direction);
+ }
+ else if(direction != input_direction)
+ { // player has changed to impossible tile
back_direction = reverse_dir(direction);
+ stop();
}
else
{
+ Direction dir = D_NONE;
+
+ if (tile->north && back_direction != D_NORTH)
+ dir = D_NORTH;
+ else if (tile->south && back_direction != D_SOUTH)
+ dir = D_SOUTH;
+ else if (tile->east && back_direction != D_EAST)
+ dir = D_EAST;
+ else if (tile->west && back_direction != D_WEST)
+ dir = D_WEST;
+
+ if (dir != D_NONE)
+ {
+ direction = dir;
+ input_direction = direction;
+ back_direction = reverse_dir(direction);
+ }
+ else
+ {
// Should never be reached if tiledata is good
stop();
return;
+ }
}
- }
+ }
// Walk automatically to the next tile
- Vector next_tile;
- if (worldmap->path_ok(direction, tile_pos, &next_tile))
+ if(direction != D_NONE)
{
+ Vector next_tile;
+ if (worldmap->path_ok(direction, tile_pos, &next_tile))
+ {
tile_pos = next_tile;
- }
- else
- {
+ }
+ else
+ {
puts("Tilemap data is buggy");
stop();
+ }
}
}
}
WorldMap::WorldMap()
{
tile_manager = new TileManager();
- tux = new Tux(this);
-
+ //tux = new Tux(this);
+
width = 20;
height = 15;
+
+ 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);
- 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);
-
- input_direction = D_NONE;
enter_level = false;
- name = "<no file>";
+ name = "<no title>";
music = "SALCON.MOD";
}
{
lisp_object_t* root_obj = lisp_read_from_file(datadir + "/levels/worldmap/" + map_filename);
if (!root_obj)
- st_abort("Couldn't load file", datadir + "/levels/worldmap/" + map_filename);
-
- std::cout << "Loading map: " << datadir + "/levels/worldmap/" + map_filename << std::endl;
+ Termination::abort("Couldn't load file", datadir + "/levels/worldmap/" + map_filename);
if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap") == 0)
{
else if (strcmp(lisp_symbol(lisp_car(element)), "properties") == 0)
{
LispReader reader(lisp_cdr(element));
- reader.read_string("name", name);
+ 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)
+ else if (strcmp(lisp_symbol(lisp_car(element)), "special-tiles") == 0 ||
+ strcmp(lisp_symbol(lisp_car(element)), "levels") == 0)
{
lisp_object_t* cur = lisp_cdr(element);
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;
+ SpecialTile special_tile;
LispReader reader(lisp_cdr(element));
- level.solved = false;
+ special_tile.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);
+ special_tile.north = true;
+ special_tile.east = true;
+ special_tile.south = true;
+ special_tile.west = true;
+
+ reader.read_string("extro-filename", special_tile.extro_filename);
+ reader.read_string("map-message", special_tile.display_map_message);
+ reader.read_string("next-world", special_tile.next_worldmap);
+ reader.read_string("level", special_tile.level_name, true);
+ reader.read_int("x", special_tile.x);
+ reader.read_int("y", special_tile.y);
+ special_tile.auto_path = true;
+ reader.read_bool("auto-path", special_tile.auto_path);
+ special_tile.swap_x = special_tile.swap_y = -1;
+ reader.read_int("swap-x", special_tile.swap_x);
+ reader.read_int("swap-y", special_tile.swap_y);
+ special_tile.vertical_flip = false;
+ reader.read_bool("flip-special_tile", special_tile.vertical_flip);
+ special_tile.quit_worldmap = false;
+ reader.read_bool("exit-game", special_tile.quit_worldmap);
+
+ special_tiles.push_back(special_tile);
+ }
- levels.push_back(level);
+ /* Kept for backward compability */
+ else if (strcmp(lisp_symbol(lisp_car(element)), "level") == 0)
+ {
+ SpecialTile special_tile;
+ LispReader reader(lisp_cdr(element));
+ special_tile.solved = false;
+
+ special_tile.north = true;
+ special_tile.east = true;
+ special_tile.south = true;
+ special_tile.west = true;
+
+ reader.read_string("extro-filename", special_tile.extro_filename);
+ if(!special_tile.extro_filename.empty())
+ special_tile.quit_worldmap = true;
+ reader.read_string("name", special_tile.level_name, true);
+ reader.read_int("x", special_tile.x);
+ reader.read_int("y", special_tile.y);
+ special_tile.vertical_flip = false;
+ special_tile.swap_x = special_tile.swap_y = -1;
+
+ special_tiles.push_back(special_tile);
}
cur = lisp_cdr(cur);
}
lisp_free(root_obj);
+ tux = new Tux(this);
}
-void WorldMap::get_level_title(Level& level)
+void WorldMap::get_level_title(SpecialTile& special_tile)
{
- /** 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);
+ /** get special_tile's title */
+ special_tile.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/" + special_tile.level_name, "supertux-level");
+ if(!reader)
+ {
+ std::cerr << "Error: Could not open special_tile file. Ignoring...\n";
+ return;
+ }
- fclose(fi);
+ reader->read_string("name", special_tile.title, true);
+ delete reader;
}
void
{
// Show or hide the menu
if(!Menu::current())
+ {
Menu::set_current(worldmap_menu);
+ tux->set_direction(D_NONE); // stop tux movement when menu is called
+ }
else
Menu::set_current(0);
}
WorldMap::get_input()
{
enter_level = false;
- input_direction = D_NONE;
SDL_Event event;
while (SDL_PollEvent(&event))
switch(event.type)
{
case SDL_QUIT:
- st_abort("Received window close", "");
+ Termination::abort("Received window close", "");
break;
case SDL_KEYDOWN:
case SDLK_RETURN:
enter_level = true;
break;
+
+ case SDLK_LEFT:
+ tux->set_direction(D_WEST);
+ break;
+ case SDLK_RIGHT:
+ tux->set_direction(D_EAST);
+ break;
+ case SDLK_UP:
+ tux->set_direction(D_NORTH);
+ break;
+ case SDLK_DOWN:
+ tux->set_direction(D_SOUTH);
+ break;
+
default:
break;
}
if (event.jaxis.axis == joystick_keymap.x_axis)
{
if (event.jaxis.value < -joystick_keymap.dead_zone)
- input_direction = D_WEST;
+ tux->set_direction(D_WEST);
else if (event.jaxis.value > joystick_keymap.dead_zone)
- input_direction = D_EAST;
+ tux->set_direction(D_EAST);
}
else if (event.jaxis.axis == joystick_keymap.y_axis)
{
if (event.jaxis.value > joystick_keymap.dead_zone)
- input_direction = D_SOUTH;
+ tux->set_direction(D_SOUTH);
else if (event.jaxis.value < -joystick_keymap.dead_zone)
- input_direction = D_NORTH;
+ tux->set_direction(D_NORTH);
}
break;
}
}
}
-
- if (!Menu::current())
- {
- Uint8 *keystate = SDL_GetKeyState(NULL);
-
- if (keystate[SDLK_LEFT])
- input_direction = D_WEST;
- else if (keystate[SDLK_RIGHT])
- input_direction = D_EAST;
- else if (keystate[SDLK_UP])
- input_direction = D_NORTH;
- else if (keystate[SDLK_DOWN])
- input_direction = D_SOUTH;
- }
}
Vector
{
if (enter_level && !tux->is_moving())
{
- Level* level = at_level();
- if (level)
+ bool level_finished = true;
+ SpecialTile* special_tile = at_special_tile();
+ if (!special_tile)
+ {
+ std::cout << "Nothing to enter at: "
+ << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
+ return;
+ }
+
+
+ if(!special_tile->level_name.empty())
{
- if (level->x == tux->get_tile_pos().x &&
- level->y == tux->get_tile_pos().y)
+ if (special_tile->x == tux->get_tile_pos().x &&
+ special_tile->y == tux->get_tile_pos().y)
{
PlayerStatus old_player_status = player_status;
- 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
+ std::cout << "Enter the current level: " << special_tile->level_name << std::endl;
+ // do a shriking fade to the special_tile
+ shrink_fade(Vector((special_tile->x*32 + 16 + offset.x),(special_tile->y*32 + 16
+ offset.y)), 500);
- GameSession session(datadir + "/levels/" + level->name,
- ST_GL_LOAD_LEVEL_FILE);
+ GameSession session(datadir + "/levels/" + special_tile->level_name,
+ ST_GL_LOAD_LEVEL_FILE, special_tile->vertical_flip);
switch (session.run())
{
case GameSession::ES_LEVEL_FINISHED:
{
- bool old_level_state = level->solved;
- level->solved = true;
+ level_finished = true;
+ bool old_level_state = special_tile->solved;
+ special_tile->solved = true;
if (session.get_current_sector()->player->got_power !=
session.get_current_sector()->player->NONE_POWER)
else
player_status.bonus = PlayerStatus::NO_BONUS;
- if (old_level_state != level->solved)
+ if (old_level_state != special_tile->solved && special_tile->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 =
- 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);
- display_text_file("CREDITS",
- "/images/background/oiltux.jpg", SCROLL_SPEED_CREDITS);
- quit = true;
- }
}
break;
case GameSession::ES_LEVEL_ABORT:
- /* In case the player's abort the level, keep it using the old
- status */
- player_status = old_player_status;
+ level_finished = false;
+ /* In case the player's abort the special_tile, keep it using the old
+ 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 */
+ special_tile 1 */
char str[80];
DrawingContext context;
- context.draw_gradient(Color (0, 255, 0), Color (255, 0, 255),
+ context.draw_gradient(Color (200,240,220), Color(200,200,220),
LAYER_BACKGROUND0);
context.draw_text_center(blue_text, _("GAMEOVER"),
sprintf(str, _("SCORE: %d"), player_status.score);
context.draw_text_center(gold_text, str,
- Vector(0, 224), LAYER_FOREGROUND1);
+ Vector(0, 230), LAYER_FOREGROUND1);
sprintf(str, _("COINS: %d"), player_status.distros);
context.draw_text_center(gold_text, str,
quit = true;
player_status.reset();
break;
- }
+ }
case GameSession::ES_NONE:
assert(false);
// Should never be reached
break;
}
- sound_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 special_tile (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 (!special_tile->extro_filename.empty())
+ {
+ // Display a text file
+ display_text_file(special_tile->extro_filename, SCROLL_SPEED_MESSAGE, white_big_text , white_text, white_small_text, blue_text );
+ }
+ if (special_tile->swap_x != -1 && special_tile->swap_y != -1)
+ {
+ // TODO: add an effect, like a camera scrolling, or at least, a fading
+ tux->set_tile_pos(Vector(special_tile->swap_x, special_tile->swap_y));
+ }
+ if (!special_tile->next_worldmap.empty())
+ {
+ // Load given worldmap
+ loadmap(special_tile->next_worldmap);
+ }
+ if (special_tile->quit_worldmap)
+ quit = true;
}
}
else
{
tux->action(delta);
- tux->set_direction(input_direction);
+// tux->set_direction(input_direction);
}
Menu* menu = Menu::current();
return tile_manager->get(tilemap[width * y + x]);
}
-WorldMap::Level*
-WorldMap::at_level()
+WorldMap::SpecialTile*
+WorldMap::at_special_tile()
{
- for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+ for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
{
if (i->x == tux->get_tile_pos().x &&
i->y == tux->get_tile_pos().y)
Vector(x*32 + offset.x, y*32 + offset.y), LAYER_TILES);
}
- for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+ for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
{
+ if(i->level_name.empty())
+ continue;
+
if (i->solved)
context.draw_surface(leveldot_green,
Vector(i->x*32 + offset.x, i->y*32 + offset.y), LAYER_TILES+1);
if (!tux->is_moving())
{
- for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+ for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
{
if (i->x == tux->get_tile_pos().x &&
i->y == tux->get_tile_pos().y)
{
- if(i->title == "")
- get_level_title(*i);
+ if(!i->level_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);
+ }
- 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() - 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 = sound_manager->load_music(datadir + "/music/" + music);
- sound_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)
delta = .3f;
last_update_time = update_time;
- update_time = st_get_ticks();
+ update_time = Ticks::get();
Vector tux_pos = tux->get_pos();
if (1)
void
WorldMap::savegame(const std::string& filename)
{
+ if(filename == "")
+ return;
+
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)
+ for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
{
if (i->solved)
++nb_solved_levels;
out << "(supertux-savegame\n"
<< " (version 1)\n"
- << " (title \"" << name << " - " << nb_solved_levels << "/" << levels.size() << "\")\n"
+ << " (title \"" << name << " - " << nb_solved_levels << "/" << special_tiles.size() << "\")\n"
<< " (map \"" << map_filename << "\")\n"
<< " (lives " << player_status.lives << ")\n"
<< " (score " << player_status.score << ")\n"
<< " (bonus \"" << bonus_to_string(player_status.bonus) << "\"))\n"
<< " (levels\n";
- for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+ for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
{
- if (i->solved)
+ if (i->solved && !i->level_name.empty())
{
- out << " (level (name \"" << i->name << "\")\n"
+ out << " (level (name \"" << i->level_name << "\")\n"
<< " (solved #t))\n";
}
}
cur = lisp_cdr(cur);
LispReader reader(cur);
- /* Get the Map filename and then load it before setting level settings */
+ /* Get the Map filename and then load it before setting special_tile settings */
reader.read_string("map", map_filename);
load_map();
bool solved = false;
LispReader level_reader(data);
- level_reader.read_string("name", name);
+ level_reader.read_string("name", name, true);
level_reader.read_bool("solved", solved);
- for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+ for(SpecialTiles::iterator i = special_tiles.begin(); i != special_tiles.end(); ++i)
{
- if (name == i->name)
+ if (name == i->level_name)
i->solved = solved;
}
}
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