X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fworld.cpp;h=8b68b0847ce063df3a84c0b914601c2061a34c20;hb=470ce0c433a316972734787d4c065525b0a1f735;hp=e9c5bb194c47ff74290fa235206f07579e3bad85;hpb=8d960ae1cab474260a82a53a2101aa6269825ca2;p=supertux.git diff --git a/src/world.cpp b/src/world.cpp index e9c5bb194..8b68b0847 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -1,9 +1,7 @@ // $Id$ -// +// // SuperTux -// Copyright (C) 2000 Bill Kendrick -// Copyright (C) 2004 Tobias Glaesser -// Copyright (C) 2004 Ingo Ruhnke +// Copyright (C) 2006 Matthias Braun // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -14,543 +12,242 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA // 02111-1307, USA. - -#include -#include -#include -#include "globals.h" -#include "scene.h" -#include "screen.h" -#include "defines.h" -#include "world.h" -#include "level.h" -#include "tile.h" -#include "resources.h" - -Surface* img_distro[4]; - -World* World::current_ = 0; - -World::World(const std::string& filename) -{ - // FIXME: Move this to action and draw and everywhere else where the - // world calls child functions - current_ = this; - - level = new Level(filename); - tux.init(); - - set_defaults(); - - get_level()->load_gfx(); - activate_bad_guys(); - activate_particle_systems(); - get_level()->load_song(); +#include + +#include +#include +#include + +#include "world.hpp" +#include "file_system.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "physfs/physfs_stream.hpp" +#include "scripting/squirrel_util.hpp" +#include "scripting/serialize.hpp" +#include "log.hpp" +#include "worldmap/worldmap.hpp" +#include "mainloop.hpp" + +static bool has_suffix(const std::string& data, const std::string& suffix) +{ + if (data.length() >= suffix.length()) + return data.compare(data.length() - suffix.length(), suffix.length(), suffix) == 0; + else + return false; } -World::World(const std::string& subset, int level_nr) -{ - // FIXME: Move this to action and draw and everywhere else where the - // world calls child functions - current_ = this; - - level = new Level(subset, level_nr); - tux.init(); - - set_defaults(); +World* World::current_ = NULL; - get_level()->load_gfx(); - activate_bad_guys(); - activate_particle_systems(); - get_level()->load_song(); +World::World() +{ + is_levelset = true; + hide_from_contribs = false; + sq_resetobject(&world_thread); } World::~World() { - delete level; + sq_release(Scripting::global_vm, &world_thread); + if(current_ == this) + current_ = NULL; } void -World::set_defaults() +World::set_savegame_filename(const std::string& filename) { - // Set defaults: - scroll_x = 0; - - player_status.score_multiplier = 1; - - counting_distros = false; - distro_counter = 0; - - /* set current song/music */ - set_current_music(LEVEL_MUSIC); + this->savegame_filename = filename; + // make sure the savegame directory exists + std::string dirname = FileSystem::dirname(filename); + if(!PHYSFS_exists(dirname.c_str())) { + if(PHYSFS_mkdir(dirname.c_str())) { + std::ostringstream msg; + msg << "Couldn't create directory for savegames '" + << dirname << "': " <::iterator i = level->badguy_data.begin(); - i != level->badguy_data.end(); - ++i) - { - add_bad_guy(i->x, i->y, i->kind, i->stay_on_platform); - } -} + basedir = FileSystem::dirname(filename); + + lisp::Parser parser; + std::auto_ptr root (parser.parse(filename)); + + const lisp::Lisp* info = root->get_lisp("supertux-world"); + if(info == NULL) + info = root->get_lisp("supertux-level-subset"); + if(info == NULL) + throw std::runtime_error("File is not a world or levelsubset file"); + + hide_from_contribs = false; + is_levelset = true; + + info->get("title", title); + info->get("description", description); + info->get("levelset", is_levelset); + info->get_vector("levels", levels); + info->get("hide-from-contribs", hide_from_contribs); + + // Level info file doesn't define any levels, so read the + // directory to see what we can find + + std::string path = basedir + "/"; + char** files = PHYSFS_enumerateFiles(path.c_str()); + if(!files) { + log_warning << "Couldn't read subset dir '" << path << "'" << std::endl; + return; + } -void -World::activate_particle_systems() -{ - if (level->particle_system == "clouds") - { - particle_systems.push_back(new CloudParticleSystem); - } - else if (level->particle_system == "snow") - { - particle_systems.push_back(new SnowParticleSystem); - } - else if (level->particle_system != "") - { - st_abort("unknown particle system specified in level", ""); + for(const char* const* filename = files; *filename != 0; ++filename) { + if(has_suffix(*filename, ".stl")) { + levels.push_back(path + *filename); } + } + PHYSFS_freeList(files); } void -World::draw() +World::run() { - int y,x; - - /* Draw the real background */ - if(get_level()->bkgd_image[0] != '\0') - { - int s = ((int)scroll_x / 2)%640; - level->img_bkgd->draw_part(s, 0,0,0,level->img_bkgd->w - s, level->img_bkgd->h); - level->img_bkgd->draw_part(0, 0,screen->w - s ,0,s,level->img_bkgd->h); - } - else - { - drawgradient(level->bkgd_top, level->bkgd_bottom); - } - - /* Draw particle systems (background) */ - std::vector::iterator p; - for(p = particle_systems.begin(); p != particle_systems.end(); ++p) - { - (*p)->draw(scroll_x, 0, 0); - } - - /* Draw background: */ - for (y = 0; y < 15; ++y) - { - for (x = 0; x < 21; ++x) - { - Tile::draw(32*x - fmodf(scroll_x, 32), y * 32, - level->bg_tiles[(int)y][(int)x + (int)(scroll_x / 32)]); - } - } - - /* Draw interactive tiles: */ - for (y = 0; y < 15; ++y) - { - for (x = 0; x < 21; ++x) - { - Tile::draw(32*x - fmodf(scroll_x, 32), y * 32, - level->ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]); - } - } - - /* (Bouncy bricks): */ - for (unsigned int i = 0; i < bouncy_bricks.size(); ++i) - bouncy_bricks[i].draw(); - - for (unsigned int i = 0; i < bad_guys.size(); ++i) - bad_guys[i].draw(); + using namespace Scripting; - tux.draw(); - - for (unsigned int i = 0; i < bullets.size(); ++i) - bullets[i].draw(); - - for (unsigned int i = 0; i < floating_scores.size(); ++i) - floating_scores[i].draw(); - - for (unsigned int i = 0; i < upgrades.size(); ++i) - upgrades[i].draw(); - - for (unsigned int i = 0; i < bouncy_distros.size(); ++i) - bouncy_distros[i].draw(); + current_ = this; + + // create new squirrel table for persisten game state + HSQUIRRELVM vm = Scripting::global_vm; - for (unsigned int i = 0; i < broken_bricks.size(); ++i) - broken_bricks[i].draw(); + sq_pushroottable(vm); + sq_pushstring(vm, "state", -1); + sq_newtable(vm); + if(SQ_FAILED(sq_createslot(vm, -3))) + throw Scripting::SquirrelError(vm, "Couldn't create state table"); + sq_pop(vm, 1); - /* Draw foreground: */ - for (y = 0; y < 15; ++y) - { - for (x = 0; x < 21; ++x) - { - Tile::draw(32*x - fmodf(scroll_x, 32), y * 32, - level->fg_tiles[(int)y][(int)x + (int)(scroll_x / 32)]); - } - } + load_state(); + + std::string filename = basedir + "/world.nut"; + try { + IFileStream in(filename); - /* Draw particle systems (foreground) */ - for(p = particle_systems.begin(); p != particle_systems.end(); ++p) - { - (*p)->draw(scroll_x, 0, 1); - } + sq_release(global_vm, &world_thread); + world_thread = create_thread(global_vm); + compile_and_run(object_to_vm(world_thread), in, filename); + } catch(std::exception& e) { + // fallback: try to load worldmap worldmap.stwm + using namespace WorldMapNS; + main_loop->push_screen(new WorldMap(basedir + "worldmap.stwm")); + } } void -World::action(double frame_ratio) +World::save_state() { - tux.action(frame_ratio); - - /* Handle bouncy distros: */ - for (unsigned int i = 0; i < bouncy_distros.size(); i++) - bouncy_distros[i].action(frame_ratio); - - /* Handle broken bricks: */ - for (unsigned int i = 0; i < broken_bricks.size(); i++) - broken_bricks[i].action(frame_ratio); - - /* Handle distro counting: */ - if (counting_distros) - { - distro_counter--; + using namespace Scripting; - if (distro_counter <= 0) - counting_distros = -1; - } + lisp::Writer writer(savegame_filename); - // Handle all kinds of game objects - for (unsigned int i = 0; i < bouncy_bricks.size(); i++) - bouncy_bricks[i].action(frame_ratio); + writer.start_list("supertux-savegame"); + writer.write_int("version", 1); - for (unsigned int i = 0; i < floating_scores.size(); i++) - floating_scores[i].action(frame_ratio); - - for (unsigned int i = 0; i < bullets.size(); ++i) - bullets[i].action(frame_ratio); + using namespace WorldMapNS; + if(WorldMap::current() != NULL) { + std::ostringstream title; + title << WorldMap::current()->get_title(); + title << " (" << WorldMap::current()->solved_level_count() + << "/" << WorldMap::current()->level_count() << ")"; + writer.write_string("title", title.str()); + } + + writer.start_list("tux"); + player_status->write(writer); + writer.end_list("tux"); + + writer.start_list("state"); - for (unsigned int i = 0; i < upgrades.size(); i++) - upgrades[i].action(frame_ratio); - - for (unsigned int i = 0; i < bad_guys.size(); i++) - bad_guys[i].action(frame_ratio); - - /* update particle systems */ - std::vector::iterator p; - for(p = particle_systems.begin(); p != particle_systems.end(); ++p) - { - (*p)->simulate(frame_ratio); - } - - /* Handle all possible collisions. */ - collision_handler(); -} - - -void -World::collision_handler() -{ - // CO_BULLET & CO_BADGUY check - for(unsigned int i = 0; i < bullets.size(); ++i) - { - for(unsigned int j = 0; j < bad_guys.size(); ++j) - { - if(bad_guys[j].dying != DYING_NOT) - continue; - if(rectcollision(&bullets[i].base, &bad_guys[j].base)) - { - // We have detected a collision and now call the - // collision functions of the collided objects. - // collide with bad_guy first, since bullet_collision will - // delete the bullet - bad_guys[j].collision(0, CO_BULLET); - bullets[i].collision(CO_BADGUY); - break; // bullet is invalid now, so break - } - } - } - - /* CO_BADGUY & CO_BADGUY check */ - for(unsigned int i = 0; i < bad_guys.size(); ++i) - { - if(bad_guys[i].dying != DYING_NOT) - continue; - - for(unsigned int j = i+1; j < bad_guys.size(); ++j) - { - if(j == i || bad_guys[j].dying != DYING_NOT) - continue; - - if(rectcollision(&bad_guys[i].base, &bad_guys[j].base)) - { - // We have detected a collision and now call the - // collision functions of the collided objects. - bad_guys[j].collision(&bad_guys[i], CO_BADGUY); - bad_guys[i].collision(&bad_guys[j], CO_BADGUY); - } - } - } - - if(tux.dying != DYING_NOT) return; - - // CO_BADGUY & CO_PLAYER check - for(unsigned int i = 0; i < bad_guys.size(); ++i) - { - if(bad_guys[i].dying != DYING_NOT) - continue; - - if(rectcollision_offset(&bad_guys[i].base,&tux.base,0,0)) - { - // We have detected a collision and now call the collision - // functions of the collided objects. - if (tux.previous_base.y < tux.base.y && - tux.previous_base.y + tux.previous_base.height - < bad_guys[i].base.y + bad_guys[i].base.height/2) - { - bad_guys[i].collision(&tux, CO_PLAYER, COLLISION_SQUISH); - } - else - { - tux.collision(&bad_guys[i], CO_BADGUY); - bad_guys[i].collision(&tux, CO_PLAYER, COLLISION_NORMAL); - } - } - } - - // CO_UPGRADE & CO_PLAYER check - for(unsigned int i = 0; i < upgrades.size(); ++i) - { - if(rectcollision(&upgrades[i].base, &tux.base)) - { - // We have detected a collision and now call the collision - // functions of the collided objects. - upgrades[i].collision(&tux, CO_PLAYER); - } - } -} - -void -World::add_score(float x, float y, int s) -{ - player_status.score += s; - - FloatingScore new_floating_score; - new_floating_score.init(x,y,s); - floating_scores.push_back(new_floating_score); -} - -void -World::add_bouncy_distro(float x, float y) -{ - BouncyDistro new_bouncy_distro; - new_bouncy_distro.init(x,y); - bouncy_distros.push_back(new_bouncy_distro); -} - -void -World::add_broken_brick(Tile* tile, float x, float y) -{ - add_broken_brick_piece(tile, x, y, -1, -4); - add_broken_brick_piece(tile, x, y + 16, -1.5, -3); - - add_broken_brick_piece(tile, x + 16, y, 1, -4); - add_broken_brick_piece(tile, x + 16, y + 16, 1.5, -3); -} - -void -World::add_broken_brick_piece(Tile* tile, float x, float y, float xm, float ym) -{ - BrokenBrick new_broken_brick; - new_broken_brick.init(tile, x, y, xm, ym); - broken_bricks.push_back(new_broken_brick); + sq_pushroottable(global_vm); + sq_pushstring(global_vm, "state", -1); + if(SQ_SUCCEEDED(sq_get(global_vm, -2))) { + Scripting::save_squirrel_table(global_vm, -1, writer); + sq_pop(global_vm, 1); + } + sq_pop(global_vm, 1); + writer.end_list("state"); + + writer.end_list("supertux-savegame"); } void -World::add_bouncy_brick(float x, float y) +World::load_state() { - BouncyBrick new_bouncy_brick; - new_bouncy_brick.init(x,y); - bouncy_bricks.push_back(new_bouncy_brick); -} + using namespace Scripting; -void -World::add_bad_guy(float x, float y, BadGuyKind kind, bool stay_on_platform) -{ - bad_guys.push_back(BadGuy()); - BadGuy& new_bad_guy = bad_guys.back(); - - new_bad_guy.init(x,y,kind, stay_on_platform); -} + try { + lisp::Parser parser; + std::auto_ptr root (parser.parse(savegame_filename)); -void -World::add_upgrade(float x, float y, Direction dir, UpgradeKind kind) -{ - Upgrade new_upgrade; - new_upgrade.init(x,y,dir,kind); - upgrades.push_back(new_upgrade); -} + const lisp::Lisp* lisp = root->get_lisp("supertux-savegame"); + if(lisp == NULL) + throw std::runtime_error("file is not a supertux-savegame file"); -void -World::add_bullet(float x, float y, float xm, Direction dir) -{ - if(bullets.size() > MAX_BULLETS-1) - return; + int version = 1; + lisp->get("version", version); + if(version != 1) + throw std::runtime_error("incompatible savegame version"); - Bullet new_bullet; - new_bullet.init(x,y,xm,dir); - bullets.push_back(new_bullet); - - play_sound(sounds[SND_SHOOT], SOUND_CENTER_SPEAKER); -} + const lisp::Lisp* tux = lisp->get_lisp("tux"); + if(tux == NULL) + throw std::runtime_error("No tux section in savegame"); + player_status->read(*tux); -/* Break a brick: */ -void -World::trybreakbrick(float x, float y, bool small) -{ - Level* plevel = get_level(); - - Tile* tile = gettile(x, y); - if (tile->brick) - { - if (tile->data > 0) - { - /* Get a distro from it: */ - add_bouncy_distro(((int)(x + 1) / 32) * 32, - (int)(y / 32) * 32); - - if (!counting_distros) - { - counting_distros = true; - distro_counter = 50; - } - - if (distro_counter <= 0) - plevel->change(x, y, TM_IA, tile->next_tile); - - play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER); - player_status.score = player_status.score + SCORE_DISTRO; - player_status.distros++; - } - else if (!small) - { - /* Get rid of it: */ - plevel->change(x, y, TM_IA, tile->next_tile); - - /* Replace it with broken bits: */ - add_broken_brick(tile, - ((int)(x + 1) / 32) * 32, - (int)(y / 32) * 32); - - /* Get some score: */ - play_sound(sounds[SND_BRICK], SOUND_CENTER_SPEAKER); - player_status.score = player_status.score + SCORE_BRICK; - } - } + const lisp::Lisp* state = lisp->get_lisp("state"); + if(state == NULL) + throw std::runtime_error("No state section in savegame"); + + sq_pushroottable(global_vm); + sq_pushstring(global_vm, "state", -1); + if(SQ_FAILED(sq_deleteslot(global_vm, -2, SQFalse))) + sq_pop(global_vm, 1); + + sq_pushstring(global_vm, "state", -1); + sq_newtable(global_vm); + load_squirrel_table(global_vm, -1, state); + if(SQ_FAILED(sq_createslot(global_vm, -3))) + throw std::runtime_error("Couldn't create state table"); + sq_pop(global_vm, 1); + } catch(std::exception& e) { + log_debug << "Couldn't load savegame: " << e.what() << std::endl; + } } -/* Empty a box: */ -void -World::tryemptybox(float x, float y, Direction col_side) +const std::string& +World::get_level_filename(unsigned int i) const { - Tile* tile = gettile(x,y); - if (!tile->fullbox) - return; - - // according to the collision side, set the upgrade direction - if(col_side == LEFT) - col_side = RIGHT; - else - col_side = LEFT; - - int posx = ((int)(x+1) / 32) * 32; - int posy = (int)(y/32) * 32 - 32; - switch(tile->data) - { - case 1: // Box with a distro! - add_bouncy_distro(posx, posy); - play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER); - player_status.score = player_status.score + SCORE_DISTRO; - player_status.distros++; - break; - - case 2: // Add an upgrade! - if (tux.size == SMALL) /* Tux is small, add mints! */ - add_upgrade(posx, posy, col_side, UPGRADE_GROWUP); - else /* Tux is big, add an iceflower: */ - add_upgrade(posx, posy, col_side, UPGRADE_ICEFLOWER); - play_sound(sounds[SND_UPGRADE], SOUND_CENTER_SPEAKER); - break; - - case 3: // Add a golden herring - add_upgrade(posx, posy, col_side, UPGRADE_HERRING); - break; - - case 4: // Add a 1up extra - add_upgrade(posx, posy, col_side, UPGRADE_1UP); - break; - default: - break; - } - - /* Empty the box: */ - level->change(x, y, TM_IA, tile->next_tile); + return levels[i]; } -/* Try to grab a distro: */ -void -World::trygrabdistro(float x, float y, int bounciness) +unsigned int +World::get_num_levels() const { - Tile* tile = gettile(x, y); - if (tile && tile->distro) - { - level->change(x, y, TM_IA, tile->next_tile); - play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER); - - if (bounciness == BOUNCE) - { - add_bouncy_distro(((int)(x + 1) / 32) * 32, - (int)(y / 32) * 32); - } - - player_status.score = player_status.score + SCORE_DISTRO; - player_status.distros++; - } + return levels.size(); } -/* Try to bump a bad guy from below: */ -void -World::trybumpbadguy(float x, float y) +const std::string& +World::get_basedir() const { - /* Bad guys: */ - for (unsigned int i = 0; i < bad_guys.size(); i++) - { - if (bad_guys[i].base.x >= x - 32 && bad_guys[i].base.x <= x + 32 && - bad_guys[i].base.y >= y - 16 && bad_guys[i].base.y <= y + 16) - { - bad_guys[i].collision(&tux, CO_PLAYER, COLLISION_BUMP); - } - } - - - /* Upgrades: */ - for (unsigned int i = 0; i < upgrades.size(); i++) - { - if (upgrades[i].base.height == 32 && - upgrades[i].base.x >= x - 32 && upgrades[i].base.x <= x + 32 && - upgrades[i].base.y >= y - 16 && upgrades[i].base.y <= y + 16) - { - upgrades[i].base.xm = -upgrades[i].base.xm; - upgrades[i].base.ym = -8; - play_sound(sounds[SND_BUMP_UPGRADE], SOUND_CENTER_SPEAKER); - } - } + return basedir; } - -/* EOF */ -