#include "shrinkfade.hpp"
#include "video/surface.hpp"
#include "video/drawing_context.hpp"
+#include "sprite/sprite.hpp"
#include "sprite/sprite_manager.hpp"
#include "audio/sound_manager.hpp"
#include "lisp/parser.hpp"
#include "main.hpp"
#include "spawn_point.hpp"
#include "file_system.hpp"
+#include "physfs/physfs_stream.hpp"
+#include "tile_manager.hpp"
+#include "tile_set.hpp"
#include "gui/menu.hpp"
#include "gui/mousecursor.hpp"
#include "control/joystickkeyboardcontroller.hpp"
#include "worldmap/tux.hpp"
#include "worldmap/sprite_change.hpp"
+static const float CAMERA_PAN_SPEED = 5.0;
+
namespace WorldMapNS {
enum WorldMapMenuIDs {
return D_NORTH;
else if (directory == "south")
return D_SOUTH;
- else
+ else if (directory == "none")
return D_NONE;
+ else {
+ log_warning << "unknown direction: \"" << directory << "\"" << std::endl;
+ return D_NONE;
+ }
}
//---------------------------------------------------------------------------
WorldMap::WorldMap(const std::string& filename, const std::string& force_spawnpoint)
- : tux(0), solids(0), force_spawnpoint(force_spawnpoint)
+ : tux(0), tileset(NULL), free_tileset(false),
+ ambient_light( 1.0f, 1.0f, 1.0f, 1.0f ), force_spawnpoint(force_spawnpoint),
+ in_level(false), panning(false)
{
- tile_manager.reset(new TileManager("images/worldmap.strf"));
-
tux = new Tux(this);
add_object(tux);
-
+
name = "<no title>";
music = "music/salcon.ogg";
worldmap_menu->add_hl();
worldmap_menu->add_entry(MNID_QUITWORLDMAP, _("Quit World"));
- load(filename);
-
// create a new squirrel table for the worldmap
using namespace Scripting;
throw Scripting::SquirrelError(global_vm, "Couldn't get table from stack");
sq_addref(global_vm, &worldmap_table);
- sq_pop(global_vm, 1);
+ sq_pop(global_vm, 1);
+
+ sound_manager->preload("sounds/warp.wav");
+
+ // load worldmap objects
+ load(filename);
}
WorldMap::~WorldMap()
{
using namespace Scripting;
- for(ScriptList::iterator i = scripts.begin();
- i != scripts.end(); ++i) {
- HSQOBJECT& object = *i;
- sq_release(global_vm, &object);
- }
- sq_release(global_vm, &worldmap_table);
-
- sq_collectgarbage(global_vm);
-
- if(current_ == this)
- current_ = NULL;
+ if(free_tileset)
+ delete tileset;
for(GameObjects::iterator i = game_objects.begin();
i != game_objects.end(); ++i) {
GameObject* object = *i;
+ try_unexpose(object);
object->unref();
}
i != spawn_points.end(); ++i) {
delete *i;
}
+
+ for(ScriptList::iterator i = scripts.begin();
+ i != scripts.end(); ++i) {
+ HSQOBJECT& object = *i;
+ sq_release(global_vm, &object);
+ }
+ sq_release(global_vm, &worldmap_table);
+
+ sq_collectgarbage(global_vm);
+
+ if(current_ == this)
+ current_ = NULL;
}
void
{
TileMap* tilemap = dynamic_cast<TileMap*> (object);
if(tilemap != 0 && tilemap->is_solid()) {
- solids = tilemap;
+ solid_tilemaps.push_back(tilemap);
}
object->ref();
+ try_expose(object);
game_objects.push_back(object);
}
void
-WorldMap::move_to_spawnpoint(const std::string& spawnpoint)
+WorldMap::try_expose(GameObject* object)
+{
+ ScriptInterface* interface = dynamic_cast<ScriptInterface*> (object);
+ if(interface != NULL) {
+ HSQUIRRELVM vm = Scripting::global_vm;
+ sq_pushobject(vm, worldmap_table);
+ interface->expose(vm, -1);
+ sq_pop(vm, 1);
+ }
+}
+
+void
+WorldMap::try_unexpose(GameObject* object)
+{
+ ScriptInterface* interface = dynamic_cast<ScriptInterface*> (object);
+ if(interface != NULL) {
+ HSQUIRRELVM vm = Scripting::global_vm;
+ SQInteger oldtop = sq_gettop(vm);
+ sq_pushobject(vm, worldmap_table);
+ try {
+ interface->unexpose(vm, -1);
+ } catch(std::exception& e) {
+ log_warning << "Couldn't unregister object: " << e.what() << std::endl;
+ }
+ sq_settop(vm, oldtop);
+ }
+}
+
+void
+WorldMap::move_to_spawnpoint(const std::string& spawnpoint, bool pan)
{
for(SpawnPoints::iterator i = spawn_points.begin(); i != spawn_points.end(); ++i) {
SpawnPoint* sp = *i;
if(sp->name == spawnpoint) {
Vector p = sp->pos;
tux->set_tile_pos(p);
+ tux->set_direction(sp->auto_dir);
+ if(pan) {
+ panning = true;
+ pan_pos = get_camera_pos_for_tux();
+ clamp_camera_position(pan_pos);
+ }
return;
}
}
try {
lisp::Parser parser;
- std::auto_ptr<lisp::Lisp> root (parser.parse(map_filename));
+ const lisp::Lisp* root = parser.parse(map_filename);
- const lisp::Lisp* lisp = root->get_lisp("supertux-level");
- if(!lisp)
+ const lisp::Lisp* level = root->get_lisp("supertux-level");
+ if(level == NULL)
throw std::runtime_error("file isn't a supertux-level file.");
- lisp->get("name", name);
-
- const lisp::Lisp* sector = lisp->get_lisp("sector");
+ level->get("name", name);
+
+ const lisp::Lisp* sector = level->get_lisp("sector");
if(!sector)
- throw std::runtime_error("No sector sepcified in worldmap file.");
-
+ throw std::runtime_error("No sector specified in worldmap file.");
+
+ const lisp::Lisp* tilesets_lisp = level->get_lisp("tilesets");
+ if(tilesets_lisp != NULL) {
+ tileset = tile_manager->parse_tileset_definition(*tilesets_lisp);
+ free_tileset = true;
+ }
+ std::string tileset_name;
+ if(level->get("tileset", tileset_name)) {
+ if(tileset != NULL) {
+ log_warning << "multiple tilesets specified in level" << std::endl;
+ } else {
+ tileset = tile_manager->get_tileset(tileset_name);
+ }
+ }
+ /* load default tileset */
+ if(tileset == NULL) {
+ tileset = tile_manager->get_tileset("images/worldmap.strf");
+ }
+ current_tileset = tileset;
+
lisp::ListIterator iter(sector);
while(iter.next()) {
if(iter.item() == "tilemap") {
- add_object(new TileMap(*(iter.lisp()), tile_manager.get()));
+ add_object(new TileMap(*(iter.lisp())));
} else if(iter.item() == "background") {
add_object(new Background(*(iter.lisp())));
} else if(iter.item() == "music") {
Teleporter* teleporter = new Teleporter(iter.lisp());
teleporters.push_back(teleporter);
add_object(teleporter);
+ } else if(iter.item() == "ambient-light") {
+ std::vector<float> vColor;
+ sector->get_vector( "ambient-light", vColor );
+ if(vColor.size() < 3) {
+ log_warning << "(ambient-light) requires a color as argument" << std::endl;
+ } else {
+ ambient_light = Color( vColor );
+ }
} else if(iter.item() == "name") {
// skip
} else {
log_warning << "Unknown token '" << iter.item() << "' in worldmap" << std::endl;
}
}
- if(solids == 0)
+ current_tileset = NULL;
+
+ if(solid_tilemaps.size() == 0)
throw std::runtime_error("No solid tilemap specified");
- move_to_spawnpoint("main");
+ move_to_spawnpoint("main");
} catch(std::exception& e) {
std::stringstream msg;
try {
lisp::Parser parser;
- std::auto_ptr<lisp::Lisp> root (parser.parse(levels_path + level.name));
+ const lisp::Lisp* root = parser.parse(levels_path + level.get_name());
const lisp::Lisp* level_lisp = root->get_lisp("supertux-level");
if(!level_lisp)
return;
-
+
level_lisp->get("name", level.title);
} catch(std::exception& e) {
log_warning << "Problem when reading leveltitle: " << e.what() << std::endl;
void WorldMap::calculate_total_stats()
{
- total_stats.reset();
+ total_stats.zero();
for(LevelTiles::iterator i = levels.begin(); i != levels.end(); ++i) {
LevelTile* level = *i;
if (level->solved) {
{
*new_pos = get_next_tile(old_pos, direction);
- if (!(new_pos->x >= 0 && new_pos->x < solids->get_width()
- && new_pos->y >= 0 && new_pos->y < solids->get_height()))
+ if (!(new_pos->x >= 0 && new_pos->x < get_width()
+ && new_pos->y >= 0 && new_pos->y < get_height()))
{ // New position is outsite the tilemap
return false;
}
else
{ // Check if the tile allows us to go to new_pos
+ int old_tile_data = tile_data_at(old_pos);
+ int new_tile_data = tile_data_at(*new_pos);
switch(direction)
{
case D_WEST:
- return (at(old_pos)->getData() & Tile::WORLDMAP_WEST
- && at(*new_pos)->getData() & Tile::WORLDMAP_EAST);
+ return (old_tile_data & Tile::WORLDMAP_WEST
+ && new_tile_data & Tile::WORLDMAP_EAST);
case D_EAST:
- return (at(old_pos)->getData() & Tile::WORLDMAP_EAST
- && at(*new_pos)->getData() & Tile::WORLDMAP_WEST);
+ return (old_tile_data & Tile::WORLDMAP_EAST
+ && new_tile_data & Tile::WORLDMAP_WEST);
case D_NORTH:
- return (at(old_pos)->getData() & Tile::WORLDMAP_NORTH
- && at(*new_pos)->getData() & Tile::WORLDMAP_SOUTH);
+ return (old_tile_data & Tile::WORLDMAP_NORTH
+ && new_tile_data & Tile::WORLDMAP_SOUTH);
case D_SOUTH:
- return (at(old_pos)->getData() & Tile::WORLDMAP_SOUTH
- && at(*new_pos)->getData() & Tile::WORLDMAP_NORTH);
+ return (old_tile_data & Tile::WORLDMAP_SOUTH
+ && new_tile_data & Tile::WORLDMAP_NORTH);
case D_NONE:
assert(!"path_ok() can't walk if direction is NONE");
calculate_total_stats();
save_state();
- if(World::current() != NULL)
- World::current()->save_state();
- if (old_level_state != level->solved && level->auto_path) {
+ if (old_level_state != level->solved) {
// Try to detect the next direction to which we should walk
// FIXME: Mostly a hack
Direction dir = D_NONE;
-
- const Tile* tile = at(tux->get_tile_pos());
+ int dirdata = available_directions_at(tux->get_tile_pos());
// first, test for crossroads
- if (tile->getData() & Tile::WORLDMAP_CNSE || tile->getData() && Tile::WORLDMAP_CNSW
- || tile->getData() & Tile::WORLDMAP_CNEW || tile->getData() && Tile::WORLDMAP_CSEW
- || tile->getData() & Tile::WORLDMAP_CNSEW)
+ if (dirdata == Tile::WORLDMAP_CNSE ||
+ dirdata == Tile::WORLDMAP_CNSW ||
+ dirdata == Tile::WORLDMAP_CNEW ||
+ dirdata == Tile::WORLDMAP_CSEW ||
+ dirdata == Tile::WORLDMAP_CNSEW)
dir = D_NONE;
- else if (tile->getData() & Tile::WORLDMAP_NORTH
+ else if (dirdata & Tile::WORLDMAP_NORTH
&& tux->back_direction != D_NORTH)
dir = D_NORTH;
- else if (tile->getData() & Tile::WORLDMAP_SOUTH
+ else if (dirdata & Tile::WORLDMAP_SOUTH
&& tux->back_direction != D_SOUTH)
dir = D_SOUTH;
- else if (tile->getData() & Tile::WORLDMAP_EAST
+ else if (dirdata & Tile::WORLDMAP_EAST
&& tux->back_direction != D_EAST)
dir = D_EAST;
- else if (tile->getData() & Tile::WORLDMAP_WEST
+ else if (dirdata & Tile::WORLDMAP_WEST
&& tux->back_direction != D_WEST)
dir = D_WEST;
}
}
+Vector
+WorldMap::get_camera_pos_for_tux() {
+ Vector camera_offset;
+ Vector tux_pos = tux->get_pos();
+ camera_offset.x = tux_pos.x - SCREEN_WIDTH/2;
+ camera_offset.y = tux_pos.y - SCREEN_HEIGHT/2;
+ return camera_offset;
+}
+
+void
+WorldMap::clamp_camera_position(Vector& c) {
+ if (c.x < 0)
+ c.x = 0;
+ if (c.y < 0)
+ c.y = 0;
+
+ if (c.x > (int)get_width()*32 - SCREEN_WIDTH)
+ c.x = (int)get_width()*32 - SCREEN_WIDTH;
+ if (c.y > (int)get_height()*32 - SCREEN_HEIGHT)
+ c.y = (int)get_height()*32 - SCREEN_HEIGHT;
+
+ if (int(get_width()*32) < SCREEN_WIDTH)
+ c.x = get_width()*16.0 - SCREEN_WIDTH/2.0;
+ if (int(get_height()*32) < SCREEN_HEIGHT)
+ c.y = get_height()*16.0 - SCREEN_HEIGHT/2.0;
+}
+
void
WorldMap::update(float delta)
{
- Menu* menu = Menu::current();
- if(menu != NULL) {
- menu->update();
+ if(!in_level) {
+ Menu* menu = Menu::current();
+ if(menu != NULL) {
+ menu->update();
- if(menu == worldmap_menu.get()) {
- switch (worldmap_menu->check())
- {
- case MNID_RETURNWORLDMAP: // Return to game
- Menu::set_current(0);
- break;
- case MNID_QUITWORLDMAP: // Quit Worldmap
- main_loop->exit_screen();
- break;
+ if(menu == worldmap_menu.get()) {
+ switch (worldmap_menu->check())
+ {
+ case MNID_RETURNWORLDMAP: // Return to game
+ Menu::set_current(0);
+ break;
+ case MNID_QUITWORLDMAP: // Quit Worldmap
+ main_loop->exit_screen();
+ break;
+ }
}
+
+ return;
}
- return;
- }
+ // update GameObjects
+ for(size_t i = 0; i < game_objects.size(); ++i) {
+ GameObject* object = game_objects[i];
+ if(!panning || object != tux) {
+ object->update(delta);
+ }
+ }
- // update GameObjects
- for(size_t i = 0; i < game_objects.size(); ++i) {
- GameObject* object = game_objects[i];
- object->update(delta);
- }
+ // remove old GameObjects
+ for(GameObjects::iterator i = game_objects.begin();
+ i != game_objects.end(); ) {
+ GameObject* object = *i;
+ if(!object->is_valid()) {
+ try_unexpose(object);
+ object->unref();
+ i = game_objects.erase(i);
+ } else {
+ ++i;
+ }
+ }
- // remove old GameObjects
- for(GameObjects::iterator i = game_objects.begin();
- i != game_objects.end(); ) {
- GameObject* object = *i;
- if(!object->is_valid()) {
- object->unref();
- i = game_objects.erase(i);
+ /* update solid_tilemaps list */
+ //FIXME: this could be more efficient
+ solid_tilemaps.clear();
+ for(std::vector<GameObject*>::iterator i = game_objects.begin();
+ i != game_objects.end(); ++i)
+ {
+ TileMap* tm = dynamic_cast<TileMap*>(*i);
+ if (!tm) continue;
+ if (tm->is_solid()) solid_tilemaps.push_back(tm);
+ }
+
+ Vector requested_pos;
+
+ // position "camera"
+ if(!panning) {
+ camera_offset = get_camera_pos_for_tux();
} else {
- ++i;
+ Vector delta = pan_pos - camera_offset;
+ float mag = delta.norm();
+ if(mag > CAMERA_PAN_SPEED) {
+ delta *= CAMERA_PAN_SPEED/mag;
+ }
+ camera_offset += delta;
+ if(camera_offset == pan_pos) {
+ panning = false;
+ }
}
- }
- // position "camera"
- Vector tux_pos = tux->get_pos();
- camera_offset.x = tux_pos.x - SCREEN_WIDTH/2;
- camera_offset.y = tux_pos.y - SCREEN_HEIGHT/2;
+ requested_pos = camera_offset;
+ clamp_camera_position(camera_offset);
- if (camera_offset.x < 0)
- camera_offset.x = 0;
- if (camera_offset.y < 0)
- camera_offset.y = 0;
-
- if (camera_offset.x > solids->get_width()*32 - SCREEN_WIDTH)
- camera_offset.x = solids->get_width()*32 - SCREEN_WIDTH;
- if (camera_offset.y > solids->get_height()*32 - SCREEN_HEIGHT)
- camera_offset.y = solids->get_height()*32 - SCREEN_HEIGHT;
-
- // handle input
- bool enter_level = false;
- if(main_controller->pressed(Controller::ACTION)
- || main_controller->pressed(Controller::JUMP)
- || main_controller->pressed(Controller::MENU_SELECT))
- enter_level = true;
- if(main_controller->pressed(Controller::PAUSE_MENU))
- on_escape_press();
-
- if (enter_level && !tux->is_moving())
- {
- /* Check special tile action */
- SpecialTile* special_tile = at_special_tile();
- if(special_tile)
- {
- if (special_tile->teleport_dest != Vector(-1,-1))
- {
- // TODO: an animation, camera scrolling or a fading would be a nice touch
- sound_manager->play("sounds/warp.wav");
- tux->back_direction = D_NONE;
- tux->set_tile_pos(special_tile->teleport_dest);
- SDL_Delay(1000);
- }
+ if(panning) {
+ if(requested_pos.x != camera_offset.x) {
+ pan_pos.x = camera_offset.x;
+ }
+ if(requested_pos.y != camera_offset.y) {
+ pan_pos.y = camera_offset.y;
}
+ }
- /* Check level action */
- LevelTile* level = at_level();
- if (!level) {
- log_warning << "No level to enter at: " << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
- return;
+ // handle input
+ bool enter_level = false;
+ if(main_controller->pressed(Controller::ACTION)
+ || main_controller->pressed(Controller::JUMP)
+ || main_controller->pressed(Controller::MENU_SELECT)) {
+ /* some people define UP and JUMP on the same key... */
+ if(!main_controller->pressed(Controller::UP))
+ enter_level = true;
+ }
+ if(main_controller->pressed(Controller::PAUSE_MENU))
+ on_escape_press();
+
+ // check for teleporters
+ Teleporter* teleporter = at_teleporter(tux->get_tile_pos());
+ if (teleporter && (teleporter->automatic || (enter_level && (!tux->is_moving())))) {
+ enter_level = false;
+ if (teleporter->worldmap != "") {
+ change(teleporter->worldmap, teleporter->spawnpoint);
+ } else {
+ // TODO: an animation, camera scrolling or a fading would be a nice touch
+ sound_manager->play("sounds/warp.wav");
+ tux->back_direction = D_NONE;
+ move_to_spawnpoint(teleporter->spawnpoint, true);
}
+ }
- if (level->pos == tux->get_tile_pos()) {
- try {
- Vector shrinkpos = Vector(level->pos.x*32 + 16 - camera_offset.x,
- level->pos.y*32 + 16 - camera_offset.y);
- std::string levelfile = levels_path + level->name;
- main_loop->push_screen(new GameSession(levelfile, &level->statistics),
- new ShrinkFade(shrinkpos, 0.5));
- } catch(std::exception& e) {
- log_fatal << "Couldn't load level: " << e.what() << std::endl;
+ // check for auto-play levels
+ LevelTile* level = at_level();
+ if (level && (level->auto_play) && (!level->solved) && (!tux->is_moving())) {
+ enter_level = true;
+ }
+
+ if (enter_level && !tux->is_moving())
+ {
+ /* Check level action */
+ LevelTile* level = at_level();
+ if (!level) {
+ //Respawn if player on a tile with no level and nowhere to go.
+ int tile_data = tile_data_at(tux->get_tile_pos());
+ if(!( tile_data & ( Tile::WORLDMAP_NORTH | Tile::WORLDMAP_SOUTH | Tile::WORLDMAP_WEST | Tile::WORLDMAP_EAST ))){
+ log_warning << "Player at illegal position " << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << " respawning." << std::endl;
+ move_to_spawnpoint("main");
+ return;
+ }
+ log_warning << "No level to enter at: " << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
+ return;
+ }
+
+ if (level->pos == tux->get_tile_pos()) {
+ try {
+ Vector shrinkpos = Vector(level->pos.x*32 + 16 - camera_offset.x,
+ level->pos.y*32 + 8 - camera_offset.y);
+ std::string levelfile = levels_path + level->get_name();
+
+ // update state and savegame
+ save_state();
+
+ main_loop->push_screen(new GameSession(levelfile, &level->statistics),
+ new ShrinkFade(shrinkpos, 1.0f));
+ in_level = true;
+ } catch(std::exception& e) {
+ log_fatal << "Couldn't load level: " << e.what() << std::endl;
+ }
}
}
- }
- else
- {
-// tux->set_direction(input_direction);
- }
+ else
+ {
+ // tux->set_direction(input_direction);
+ }
+ }
}
-const Tile*
-WorldMap::at(Vector p)
+int
+WorldMap::tile_data_at(Vector p)
{
- return solids->get_tile((int) p.x, (int) p.y);
+ int dirs = 0;
+
+ for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) {
+ TileMap* tilemap = *i;
+ const Tile* tile = tilemap->get_tile((int)p.x, (int)p.y);
+ int dirdata = tile->getData();
+ dirs |= dirdata;
+ }
+
+ return dirs;
+}
+
+int
+WorldMap::available_directions_at(Vector p)
+{
+ return tile_data_at(p) & Tile::WORLDMAP_DIR_MASK;
}
LevelTile*
i != special_tiles.end(); ++i) {
SpecialTile* special_tile = *i;
if (special_tile->pos == tux->get_tile_pos())
- return special_tile;
+ return special_tile;
}
return NULL;
void
WorldMap::draw(DrawingContext& context)
{
+ if (int(get_width()*32) < SCREEN_WIDTH || int(get_height()*32) < SCREEN_HEIGHT)
+ context.draw_filled_rect(Vector(0, 0), Vector(SCREEN_WIDTH, SCREEN_HEIGHT),
+ Color(0.0f, 0.0f, 0.0f, 1.0f), LAYER_BACKGROUND0);
+
+ context.set_ambient_color( ambient_light );
context.push_transform();
context.set_translation(camera_offset);
-
+
for(GameObjects::iterator i = game_objects.begin();
i != game_objects.end(); ++i) {
GameObject* object = *i;
- object->draw(context);
+ if(!panning || object != tux) {
+ object->draw(context);
+ }
}
-
+
+/*
+ // FIXME: make this a runtime switch similar to draw_collrects/show_collrects?
+ // draw visual indication of possible walk directions
+ static int flipme = 0;
+ if (flipme++ & 0x04)
+ for (int x = 0; x < get_width(); x++) {
+ for (int y = 0; y < get_height(); y++) {
+ int data = tile_data_at(Vector(x,y));
+ int px = x * 32;
+ int py = y * 32;
+ const int W = 4;
+ if (data & Tile::WORLDMAP_NORTH) context.draw_filled_rect(Rect(px + 16-W, py , px + 16+W, py + 16-W), Color(0.2f, 0.2f, 0.2f, 0.7f), LAYER_FOREGROUND1 + 1000);
+ if (data & Tile::WORLDMAP_SOUTH) context.draw_filled_rect(Rect(px + 16-W, py + 16+W, px + 16+W, py + 32 ), Color(0.2f, 0.2f, 0.2f, 0.7f), LAYER_FOREGROUND1 + 1000);
+ if (data & Tile::WORLDMAP_EAST) context.draw_filled_rect(Rect(px + 16+W, py + 16-W, px + 32 , py + 16+W), Color(0.2f, 0.2f, 0.2f, 0.7f), LAYER_FOREGROUND1 + 1000);
+ if (data & Tile::WORLDMAP_WEST) context.draw_filled_rect(Rect(px , py + 16-W, px + 16-W, py + 16+W), Color(0.2f, 0.2f, 0.2f, 0.7f), LAYER_FOREGROUND1 + 1000);
+ if (data & Tile::WORLDMAP_DIR_MASK) context.draw_filled_rect(Rect(px + 16-W, py + 16-W, px + 16+W, py + 16+W), Color(0.2f, 0.2f, 0.2f, 0.7f), LAYER_FOREGROUND1 + 1000);
+ if (data & Tile::WORLDMAP_STOP) context.draw_filled_rect(Rect(px + 4 , py + 4 , px + 28 , py + 28 ), Color(0.2f, 0.2f, 0.2f, 0.7f), LAYER_FOREGROUND1 + 1000);
+ }
+ }
+*/
+
draw_status(context);
context.pop_transform();
}
{
context.push_transform();
context.set_translation(Vector(0, 0));
-
+
player_status->draw(context);
if (!tux->is_moving()) {
for(LevelTiles::iterator i = levels.begin(); i != levels.end(); ++i) {
LevelTile* level = *i;
-
+
if (level->pos == tux->get_tile_pos()) {
if(level->title == "")
get_level_title(*level);
context.draw_text(white_text, level->title,
- Vector(SCREEN_WIDTH/2,
- SCREEN_HEIGHT - white_text->get_height() - 30),
- CENTER_ALLIGN, LAYER_FOREGROUND1);
-
+ Vector(SCREEN_WIDTH/2,
+ SCREEN_HEIGHT - white_text->get_height() - 30),
+ ALIGN_CENTER, LAYER_FOREGROUND1);
+
// if level is solved, draw level picture behind stats
/*
if (level->solved) {
}
}
*/
-
+
level->statistics.draw_worldmap_info(context);
break;
}
for(SpecialTiles::iterator i = special_tiles.begin();
i != special_tiles.end(); ++i) {
SpecialTile* special_tile = *i;
-
+
if (special_tile->pos == tux->get_tile_pos()) {
/* Display an in-map message in the map, if any as been selected */
if(!special_tile->map_message.empty() && !special_tile->passive_message)
- context.draw_text(gold_text, special_tile->map_message,
+ context.draw_text(gold_text, special_tile->map_message,
Vector(SCREEN_WIDTH/2,
SCREEN_HEIGHT - white_text->get_height() - 60),
- CENTER_ALLIGN, LAYER_FOREGROUND1);
+ ALIGN_CENTER, LAYER_FOREGROUND1);
break;
}
}
+
+ // display teleporter messages
+ Teleporter* teleporter = at_teleporter(tux->get_tile_pos());
+ if (teleporter && (teleporter->message != "")) {
+ Vector pos = Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT - white_text->get_height() - 30);
+ context.draw_text(white_text, teleporter->message, pos, ALIGN_CENTER, LAYER_FOREGROUND1);
+ }
+
}
-
+
/* Display a passive message in the map, if needed */
if(passive_message_timer.started())
- context.draw_text(gold_text, passive_message,
+ context.draw_text(gold_text, passive_message,
Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT - white_text->get_height() - 60),
- CENTER_ALLIGN, LAYER_FOREGROUND1);
+ ALIGN_CENTER, LAYER_FOREGROUND1);
context.pop_transform();
}
current_ = this;
load_state();
- // if force_spawnpoint was set, move Tux there
- if (force_spawnpoint != "") move_to_spawnpoint(force_spawnpoint);
+ // if force_spawnpoint was set, move Tux there, then clear force_spawnpoint
+ if (force_spawnpoint != "") {
+ move_to_spawnpoint(force_spawnpoint);
+ force_spawnpoint = "";
+ }
+
+ tux->setup();
// register worldmap_table as worldmap in scripting
using namespace Scripting;
-
+
sq_pushroottable(global_vm);
sq_pushstring(global_vm, "worldmap", -1);
sq_pushobject(global_vm, worldmap_table);
throw SquirrelError(global_vm, "Couldn't set worldmap in roottable");
sq_pop(global_vm, 1);
+ //Run default.nut just before init script
+ try {
+ IFileStream in(levels_path + "/default.nut");
+ run_script(in, "WorldMap::default.nut");
+ } catch(std::exception& ) {
+ // doesn't exist or erroneous; do nothing
+ }
+
+
if(init_script != "") {
std::istringstream in(init_script);
run_script(in, "WorldMap::init");
void
WorldMap::leave()
{
- // remove worldmap_table from roottable
using namespace Scripting;
+ // save state of world and player
+ save_state();
+
+ // remove worldmap_table from roottable
sq_pushroottable(global_vm);
sq_pushstring(global_vm, "worldmap", -1);
if(SQ_FAILED(sq_deleteslot(global_vm, -2, SQFalse)))
sq_pop(global_vm, 1);
}
-static void store_float(HSQUIRRELVM vm, const char* name, float val)
-{
- sq_pushstring(vm, name, -1);
- sq_pushfloat(vm, val);
- if(SQ_FAILED(sq_createslot(vm, -3)))
- throw Scripting::SquirrelError(vm, "Couldn't add float value to table");
-}
-
-/*
-static void store_int(HSQUIRRELVM vm, const char* name, int val)
-{
- sq_pushstring(vm, name, -1);
- sq_pushinteger(vm, val);
- if(SQ_FAILED(sq_createslot(vm, -3)))
- throw Scripting::SquirrelError(vm, "Couldn't add float value to table");
-}
-*/
-
-static void store_string(HSQUIRRELVM vm, const char* name, const std::string& val)
-{
- sq_pushstring(vm, name, -1);
- sq_pushstring(vm, val.c_str(), val.length());
- if(SQ_FAILED(sq_createslot(vm, -3)))
- throw Scripting::SquirrelError(vm, "Couldn't add float value to table");
-}
-
-static void store_bool(HSQUIRRELVM vm, const char* name, bool val)
-{
- sq_pushstring(vm, name, -1);
- sq_pushbool(vm, val ? SQTrue : SQFalse);
- if(SQ_FAILED(sq_createslot(vm, -3)))
- throw Scripting::SquirrelError(vm, "Couldn't add float value to table");
-}
-
-static float read_float(HSQUIRRELVM vm, const char* name)
-{
- sq_pushstring(vm, name, -1);
- if(SQ_FAILED(sq_get(vm, -2))) {
- std::ostringstream msg;
- msg << "Couldn't get float value for '" << name << "' from table";
- throw Scripting::SquirrelError(vm, msg.str());
- }
-
- float result;
- if(SQ_FAILED(sq_getfloat(vm, -1, &result))) {
- std::ostringstream msg;
- msg << "Couldn't get float value for '" << name << "' from table";
- throw Scripting::SquirrelError(vm, msg.str());
- }
- sq_pop(vm, 1);
-
- return result;
-}
-
-static std::string read_string(HSQUIRRELVM vm, const char* name)
-{
- sq_pushstring(vm, name, -1);
- if(SQ_FAILED(sq_get(vm, -2))) {
- std::ostringstream msg;
- msg << "Couldn't get string value for '" << name << "' from table";
- throw Scripting::SquirrelError(vm, msg.str());
- }
-
- const char* result;
- if(SQ_FAILED(sq_getstring(vm, -1, &result))) {
- std::ostringstream msg;
- msg << "Couldn't get string value for '" << name << "' from table";
- throw Scripting::SquirrelError(vm, msg.str());
- }
- sq_pop(vm, 1);
-
- return std::string(result);
-}
-
-static bool read_bool(HSQUIRRELVM vm, const char* name)
-{
- sq_pushstring(vm, name, -1);
- if(SQ_FAILED(sq_get(vm, -2))) {
- std::ostringstream msg;
- msg << "Couldn't get bool value for '" << name << "' from table";
- throw Scripting::SquirrelError(vm, msg.str());
- }
-
- SQBool result;
- if(SQ_FAILED(sq_getbool(vm, -1, &result))) {
- std::ostringstream msg;
- msg << "Couldn't get bool value for '" << name << "' from table";
- throw Scripting::SquirrelError(vm, msg.str());
- }
- sq_pop(vm, 1);
-
- return result == SQTrue;
-}
-
void
WorldMap::save_state()
{
using namespace Scripting;
-
+
HSQUIRRELVM vm = global_vm;
int oldtop = sq_gettop(vm);
if(SQ_FAILED(sq_get(vm, -2)))
throw Scripting::SquirrelError(vm, "Couldn't create.get state.worlds");
}
-
+
sq_pushstring(vm, map_filename.c_str(), map_filename.length());
if(SQ_FAILED(sq_deleteslot(vm, -2, SQFalse)))
sq_pop(vm, 1);
// store tux
sq_pushstring(vm, "tux", -1);
sq_newtable(vm);
-
+
store_float(vm, "x", tux->get_tile_pos().x);
store_float(vm, "y", tux->get_tile_pos().y);
store_string(vm, "back", direction_to_string(tux->back_direction));
sq_createslot(vm, -3);
-
+
// levels...
sq_pushstring(vm, "levels", -1);
sq_newtable(vm);
for(LevelTiles::iterator i = levels.begin(); i != levels.end(); ++i) {
LevelTile* level = *i;
-
- if (level->solved) {
- sq_pushstring(vm, level->name.c_str(), -1);
- sq_newtable(vm);
- store_bool(vm, "solved", true);
- // TODO write statistics
- // i->statistics.write(writer);
+ sq_pushstring(vm, level->get_name().c_str(), -1);
+ sq_newtable(vm);
- sq_createslot(vm, -3);
- }
+ store_bool(vm, "solved", level->solved);
+ level->statistics.serialize_to_squirrel(vm);
+
+ sq_createslot(vm, -3);
}
-
+
sq_createslot(vm, -3);
+ // overall statistics...
+ total_stats.serialize_to_squirrel(vm);
+
// push world into worlds table
sq_createslot(vm, -3);
- } catch(std::exception& e) {
+ } catch(std::exception& ) {
sq_settop(vm, oldtop);
}
sq_settop(vm, oldtop);
+
+ if(World::current() != NULL)
+ World::current()->save_state();
}
void
WorldMap::load_state()
{
using namespace Scripting;
-
+
HSQUIRRELVM vm = global_vm;
int oldtop = sq_gettop(vm);
-
+
try {
// get state table
sq_pushroottable(vm);
// get table for our world
sq_pushstring(vm, map_filename.c_str(), map_filename.length());
if(SQ_FAILED(sq_get(vm, -2)))
- throw Scripting::SquirrelError(vm, "Couldn't get state.world.mapfilename");
+ throw Scripting::SquirrelError(vm, "Couldn't get state.worlds.mapfilename");
// load tux
sq_pushstring(vm, "tux", -1);
for(LevelTiles::iterator i = levels.begin(); i != levels.end(); ++i) {
LevelTile* level = *i;
- sq_pushstring(vm, level->name.c_str(), -1);
+ sq_pushstring(vm, level->get_name().c_str(), -1);
if(SQ_SUCCEEDED(sq_get(vm, -2))) {
level->solved = read_bool(vm, "solved");
level->sprite->set_action(level->solved ? "solved" : "default");
- // i->statistics.parse(*level);
+ level->statistics.unserialize_from_squirrel(vm);
sq_pop(vm, 1);
}
}
+
+ // leave state table
sq_pop(vm, 1);
+ // load overall statistics
+ total_stats.unserialize_from_squirrel(vm);
+
} catch(std::exception& e) {
log_debug << "Not loading worldmap state: " << e.what() << std::endl;
}
sq_settop(vm, oldtop);
+
+ in_level = false;
}
size_t
size_t count = 0;
for(LevelTiles::iterator i = levels.begin(); i != levels.end(); ++i) {
LevelTile* level = *i;
-
+
if(level->solved)
count++;
}
return vm;
}
-
+
+float
+WorldMap::get_width() const
+{
+ float width = 0;
+ for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) {
+ TileMap* solids = *i;
+ if (solids->get_width() > width) width = solids->get_width();
+ }
+ return width;
+}
+
+float
+WorldMap::get_height() const
+{
+ float height = 0;
+ for(std::list<TileMap*>::const_iterator i = solid_tilemaps.begin(); i != solid_tilemaps.end(); i++) {
+ TileMap* solids = *i;
+ if (solids->get_height() > height) height = solids->get_height();
+ }
+ return height;
+}
+
} // namespace WorldMapNS
projects / supertux.git / blobdiff