X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.cpp;h=4db083fbdb1ef2b59fe35817dc64cf1189133ec1;hb=eec2a8dbb9ad3bb1ce562fef57ca04ab719fc050;hp=657996f33573f3074a494a53155dfdf785a84572;hpb=11ea32de7fcc2d667b13f95bb7097d808e6b0dd4;p=supertux.git diff --git a/src/sector.cpp b/src/sector.cpp index 657996f33..4db083fbd 100644 --- a/src/sector.cpp +++ b/src/sector.cpp @@ -16,7 +16,6 @@ // 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 @@ -27,37 +26,43 @@ #include #include -#include "sector.h" -#include "player_status.h" -#include "object/gameobjs.h" -#include "object/camera.h" -#include "object/background.h" -#include "object/particlesystem.h" -#include "object/tilemap.h" -#include "lisp/parser.h" -#include "lisp/lisp.h" -#include "lisp/writer.h" -#include "lisp/list_iterator.h" -#include "tile.h" -#include "audio/sound_manager.h" -#include "game_session.h" -#include "resources.h" -#include "statistics.h" -#include "collision_grid.h" -#include "collision_grid_iterator.h" -#include "object_factory.h" -#include "collision.h" -#include "math/rect.h" -#include "math/aatriangle.h" -#include "object/coin.h" -#include "object/block.h" -#include "object/invisible_block.h" -#include "object/bullet.h" -#include "badguy/jumpy.h" -#include "badguy/spike.h" -#include "trigger/sequence_trigger.h" -#include "player_status.h" -#include "scripting/script_interpreter.h" +#include "sector.hpp" +#include "player_status.hpp" +#include "object/gameobjs.hpp" +#include "object/camera.hpp" +#include "object/background.hpp" +#include "object/particlesystem.hpp" +#include "object/particlesystem_interactive.hpp" +#include "object/tilemap.hpp" +#include "lisp/parser.hpp" +#include "lisp/lisp.hpp" +#include "lisp/writer.hpp" +#include "lisp/list_iterator.hpp" +#include "tile.hpp" +#include "audio/sound_manager.hpp" +#include "game_session.hpp" +#include "resources.hpp" +#include "statistics.hpp" +#include "collision_grid.hpp" +#include "collision_grid_iterator.hpp" +#include "object_factory.hpp" +#include "collision.hpp" +#include "spawn_point.hpp" +#include "math/rect.hpp" +#include "math/aatriangle.hpp" +#include "object/coin.hpp" +#include "object/block.hpp" +#include "object/invisible_block.hpp" +#include "object/bullet.hpp" +#include "object/text_object.hpp" +#include "badguy/jumpy.hpp" +#include "badguy/spike.hpp" +#include "trigger/sequence_trigger.hpp" +#include "player_status.hpp" +#include "scripting/script_interpreter.hpp" +#include "scripting/sound.hpp" +#include "scripting/scripted_object.hpp" +#include "scripting/text.hpp" //#define USE_GRID @@ -65,13 +70,17 @@ Sector* Sector::_current = 0; Sector::Sector() : gravity(10), player(0), solids(0), camera(0), - interpreter(0), currentmusic(LEVEL_MUSIC) + currentmusic(LEVEL_MUSIC) { - song_title = "Mortimers_chipdisko.mod"; + song_title = "chipdisko.ogg"; player = new Player(&player_status); add_object(player); +#ifdef USE_GRID grid = new CollisionGrid(32000, 32000); +#else + grid = 0; +#endif } Sector::~Sector() @@ -109,6 +118,14 @@ Sector::parse_object(const std::string& name, const lisp::Lisp& reader) RainParticleSystem* partsys = new RainParticleSystem(); partsys->parse(reader); return partsys; + } else if(name == "particles-comets") { + CometParticleSystem* partsys = new CometParticleSystem(); + partsys->parse(reader); + return partsys; + } else if(name == "particles-ghosts") { + GhostParticleSystem* partsys = new GhostParticleSystem(); + partsys->parse(reader); + return partsys; } else if(name == "particles-clouds") { CloudParticleSystem* partsys = new CloudParticleSystem(); partsys->parse(reader); @@ -140,14 +157,8 @@ Sector::parse(const lisp::Lisp& sector) iter.value()->get(gravity); } else if(token == "music") { iter.value()->get(song_title); - load_music(); } else if(token == "spawnpoint") { - const lisp::Lisp* spawnpoint_lisp = iter.lisp(); - - SpawnPoint* sp = new SpawnPoint; - spawnpoint_lisp->get("name", sp->name); - spawnpoint_lisp->get("x", sp->pos.x); - spawnpoint_lisp->get("y", sp->pos.y); + SpawnPoint* sp = new SpawnPoint(iter.lisp()); spawnpoints.push_back(sp); } else if(token == "init-script") { iter.value()->get(init_script); @@ -230,9 +241,8 @@ Sector::parse_old_format(const lisp::Lisp& reader) spawn->name = "main"; spawnpoints.push_back(spawn); - song_title = "Mortimers_chipdisko.mod"; + song_title = "chipdisko.ogg"; reader.get("music", song_title); - load_music(); int width, height = 15; reader.get("width", width); @@ -418,21 +428,8 @@ Sector::activate(const std::string& spawnpoint) // Run init script if(init_script != "") { - try { - // TODO we should keep the interpreter across sessions (or some variables) - // so that you can store information across levels/sectors... - delete interpreter; - interpreter = 0; - interpreter = new ScriptInterpreter(); - std::string sourcename = std::string("Sector(") + name + ") - init"; - std::istringstream in(init_script); - printf("Load script.\n"); - interpreter->load_script(in, sourcename); - printf("run script.\n"); - interpreter->run_script(); - } catch(std::exception& e) { - std::cerr << "Couldn't execute init script: " << e.what() << "\n"; - } + ScriptInterpreter::add_script_object(this, + std::string("Sector(") + name + ") - init", init_script); } } @@ -454,7 +451,7 @@ Sector::get_active_region() } void -Sector::action(float elapsed_time) +Sector::update(float elapsed_time) { player->check_bounds(camera); @@ -464,7 +461,7 @@ Sector::action(float elapsed_time) if(!object->is_valid()) continue; - object->action(elapsed_time); + object->update(elapsed_time); } #else /* update objects */ @@ -474,7 +471,7 @@ Sector::action(float elapsed_time) if(!object->is_valid()) continue; - object->action(elapsed_time); + object->update(elapsed_time); } #endif @@ -502,10 +499,12 @@ Sector::update_game_objects() std::remove(bullets.begin(), bullets.end(), bullet), bullets.end()); } +#ifdef USE_GRID MovingObject* movingobject = dynamic_cast (object); if(movingobject) { grid->remove_object(movingobject); } +#endif delete *i; i = gameobjects.erase(i); } @@ -520,9 +519,11 @@ Sector::update_game_objects() if(bullet) bullets.push_back(bullet); +#ifdef USE_GRID MovingObject* movingobject = dynamic_cast (object); if(movingobject) grid->add_object(movingobject); +#endif TileMap* tilemap = dynamic_cast (object); if(tilemap && tilemap->is_solid()) { @@ -768,7 +769,7 @@ Sector::add_bullet(const Vector& pos, float xm, Direction dir) } add_object(new_bullet); - sound_manager->play_sound("shoot"); + sound_manager->play("sounds/shoot.ogg"); return true; } @@ -787,25 +788,18 @@ Sector::add_floating_text(const Vector& pos, const std::string& text) } void -Sector::load_music() -{ - level_song = sound_manager->load_music( - get_resource_filename("/music/" + song_title)); -} - -void Sector::play_music(MusicType type) { currentmusic = type; switch(currentmusic) { case LEVEL_MUSIC: - sound_manager->play_music(level_song); + sound_manager->play_music(std::string("music/") + song_title); break; case HERRING_MUSIC: - sound_manager->play_music(herring_song); + sound_manager->play_music("music/salcon.ogg"); break; default: - sound_manager->halt_music(); + sound_manager->play_music(""); break; } } @@ -823,7 +817,7 @@ Sector::get_total_badguys() for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) { BadGuy* badguy = dynamic_cast (*i); - if(badguy) + if (badguy && badguy->countMe) total_badguys++; }