X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsector.cpp;h=79d80c6f5e31aff6ad62b2d2163161cec31697ed;hb=b72c5d178e4cc95130735d8bf8716513c7cc28e1;hp=a33ad644a87ce7fc53274e2fdcbf60ec969ab22d;hpb=44c614038ecdc2d1b69a6fee255d9c0ebc2a5098;p=supertux.git diff --git a/src/sector.cpp b/src/sector.cpp index a33ad644a..79d80c6f5 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 @@ -24,43 +23,47 @@ #include #include #include +#include #include -#include "app/globals.h" -#include "sector.h" -#include "utils/lispreader.h" -#include "object/gameobjs.h" -#include "object/camera.h" -#include "object/background.h" -#include "object/particlesystem.h" -#include "object/tilemap.h" -#include "tile.h" -#include "audio/sound_manager.h" -#include "gameloop.h" -#include "resources.h" -#include "statistics.h" -#include "special/collision.h" -#include "math/rectangle.h" -#include "math/aatriangle.h" -#include "object/coin.h" -#include "object/block.h" -#include "object/invisible_block.h" -#include "object/invisible_tile.h" -#include "object/platform.h" -#include "object/bullet.h" -#include "badguy/jumpy.h" -#include "badguy/snowball.h" -#include "badguy/bouncing_snowball.h" -#include "badguy/flame.h" -#include "badguy/mriceblock.h" -#include "badguy/mrbomb.h" -#include "badguy/dispenser.h" -#include "badguy/spike.h" -#include "badguy/spiky.h" -#include "badguy/nolok_01.h" -#include "trigger/door.h" -#include "trigger/sequence_trigger.h" -#include "trigger/secretarea_trigger.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 "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 Sector* Sector::_current = 0; @@ -68,9 +71,15 @@ Sector::Sector() : gravity(10), player(0), solids(0), camera(0), currentmusic(LEVEL_MUSIC) { - song_title = "Mortimers_chipdisko.mod"; - player = new Player(); + 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() @@ -78,6 +87,8 @@ Sector::~Sector() update_game_objects(); assert(gameobjects_new.size() == 0); + delete grid; + for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) { delete *i; @@ -92,83 +103,66 @@ Sector::~Sector() } GameObject* -Sector::parse_object(const std::string& name, LispReader& reader) +Sector::parse_object(const std::string& name, const lisp::Lisp& reader) { - if(name == "background") { - return new Background(reader); - } else if(name == "camera") { + if(name == "camera") { Camera* camera = new Camera(this); camera->parse(reader); return camera; - } else if(name == "tilemap") { - return new TileMap(reader); } else if(name == "particles-snow") { SnowParticleSystem* partsys = new SnowParticleSystem(); partsys->parse(reader); return partsys; + } else if(name == "particles-rain") { + 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); return partsys; - } else if(name == "door") { - return new Door(reader); - } else if(name == "secretarea") { - return new SecretAreaTrigger(reader); - } else if(name == "platform") { - return new Platform(reader); - } else if(name == "jumpy" || name == "money") { + } else if(name == "money") { // for compatibility with old maps return new Jumpy(reader); - } else if(name == "snowball") { - return new SnowBall(reader); - } else if(name == "bouncingsnowball") { - return new BouncingSnowball(reader); - } else if(name == "flame") { - return new Flame(reader); - } else if(name == "mriceblock") { - return new MrIceBlock(reader); - } else if(name == "mrbomb") { - return new MrBomb(reader); - } else if(name == "dispenser") { - return new Dispenser(reader); - } else if(name == "spike") { - return new Spike(reader); - } else if(name == "spiky") { - return new Spiky(reader); - } else if(name == "nolok_01") { - return new Nolok_01(reader); - } - - std::cerr << "Unknown object type '" << name << "'.\n"; + } + + try { + return create_object(name, reader); + } catch(std::exception& e) { + std::cerr << e.what() << "\n"; + } + return 0; } void -Sector::parse(LispReader& lispreader) +Sector::parse(const lisp::Lisp& sector) { _current = this; - for(lisp_object_t* cur = lispreader.get_lisp(); !lisp_nil_p(cur); - cur = lisp_cdr(cur)) { - std::string token = lisp_symbol(lisp_car(lisp_car(cur))); - // FIXME: doesn't handle empty data - lisp_object_t* data = lisp_car(lisp_cdr(lisp_car(cur))); - LispReader reader(lisp_cdr(lisp_car(cur))); - + lisp::ListIterator iter(§or); + while(iter.next()) { + const std::string& token = iter.item(); if(token == "name") { - name = lisp_string(data); + iter.value()->get(name); } else if(token == "gravity") { - gravity = lisp_real(data); + iter.value()->get(gravity); } else if(token == "music") { - song_title = lisp_string(data); - load_music(); - } else if(token == "spawn-points") { - SpawnPoint* sp = new SpawnPoint; - reader.read_string("name", sp->name); - reader.read_float("x", sp->pos.x); - reader.read_float("y", sp->pos.y); + iter.value()->get(song_title); + } else if(token == "spawnpoint") { + SpawnPoint* sp = new SpawnPoint(iter.lisp()); spawnpoints.push_back(sp); + } else if(token == "init-script") { + iter.value()->get(init_script); } else { - GameObject* object = parse_object(token, reader); + GameObject* object = parse_object(token, *(iter.lisp())); if(object) { add_object(object); } @@ -177,42 +171,43 @@ Sector::parse(LispReader& lispreader) update_game_objects(); fix_old_tiles(); - update_game_objects(); if(!camera) { std::cerr << "sector '" << name << "' does not contain a camera.\n"; - camera = new Camera(this); - add_object(camera); + update_game_objects(); + add_object(new Camera(this)); } if(!solids) throw std::runtime_error("sector does not contain a solid tile layer."); + + update_game_objects(); } void -Sector::parse_old_format(LispReader& reader) +Sector::parse_old_format(const lisp::Lisp& reader) { _current = this; name = "main"; - reader.read_float("gravity", gravity); + reader.get("gravity", gravity); std::string backgroundimage; - reader.read_string("background", backgroundimage); + reader.get("background", backgroundimage); float bgspeed = .5; - reader.read_float("bkgd_speed", bgspeed); + reader.get("bkgd_speed", bgspeed); bgspeed /= 100; Color bkgd_top, bkgd_bottom; int r = 0, g = 0, b = 128; - reader.read_int("bkgd_red_top", r); - reader.read_int("bkgd_green_top", g); - reader.read_int("bkgd_blue_top", b); + reader.get("bkgd_red_top", r); + reader.get("bkgd_green_top", g); + reader.get("bkgd_blue_top", b); bkgd_top.red = r; bkgd_top.green = g; bkgd_top.blue = b; - reader.read_int("bkgd_red_bottom", r); - reader.read_int("bkgd_green_bottom", g); - reader.read_int("bkgd_blue_bottom", b); + reader.get("bkgd_red_bottom", r); + reader.get("bkgd_green_bottom", g); + reader.get("bkgd_blue_bottom", b); bkgd_bottom.red = r; bkgd_bottom.green = g; bkgd_bottom.blue = b; @@ -228,89 +223,80 @@ Sector::parse_old_format(LispReader& reader) } std::string particlesystem; - reader.read_string("particle_system", particlesystem); + reader.get("particle_system", particlesystem); if(particlesystem == "clouds") add_object(new CloudParticleSystem()); else if(particlesystem == "snow") add_object(new SnowParticleSystem()); + else if(particlesystem == "rain") + add_object(new RainParticleSystem()); Vector startpos(100, 170); - reader.read_float("start_pos_x", startpos.x); - reader.read_float("start_pos_y", startpos.y); + reader.get("start_pos_x", startpos.x); + reader.get("start_pos_y", startpos.y); SpawnPoint* spawn = new SpawnPoint; spawn->pos = startpos; spawn->name = "main"; spawnpoints.push_back(spawn); - song_title = "Mortimers_chipdisko.mod"; - reader.read_string("music", song_title); - load_music(); + song_title = "chipdisko.ogg"; + reader.get("music", song_title); int width, height = 15; - reader.read_int("width", width); - reader.read_int("height", height); + reader.get("width", width); + reader.get("height", height); std::vector tiles; - if(reader.read_int_vector("interactive-tm", tiles) - || reader.read_int_vector("tilemap", tiles)) { + if(reader.get_vector("interactive-tm", tiles) + || reader.get_vector("tilemap", tiles)) { TileMap* tilemap = new TileMap(); tilemap->set(width, height, tiles, LAYER_TILES, true); add_object(tilemap); } - if(reader.read_int_vector("background-tm", tiles)) { + if(reader.get_vector("background-tm", tiles)) { TileMap* tilemap = new TileMap(); tilemap->set(width, height, tiles, LAYER_BACKGROUNDTILES, false); add_object(tilemap); } - if(reader.read_int_vector("foreground-tm", tiles)) { + if(reader.get_vector("foreground-tm", tiles)) { TileMap* tilemap = new TileMap(); tilemap->set(width, height, tiles, LAYER_FOREGROUNDTILES, false); add_object(tilemap); } // read reset-points (now spawn-points) - { - lisp_object_t* cur = 0; - if(reader.read_lisp("reset-points", cur)) { - while(!lisp_nil_p(cur)) { - lisp_object_t* data = lisp_car(cur); - LispReader reader(lisp_cdr(data)); - + const lisp::Lisp* resetpoints = reader.get_lisp("reset-points"); + if(resetpoints) { + lisp::ListIterator iter(resetpoints); + while(iter.next()) { + if(iter.item() == "point") { Vector sp_pos; - if(reader.read_float("x", sp_pos.x) && reader.read_float("y", sp_pos.y)) + if(reader.get("x", sp_pos.x) && reader.get("y", sp_pos.y)) { SpawnPoint* sp = new SpawnPoint; sp->name = "main"; sp->pos = sp_pos; spawnpoints.push_back(sp); } - - cur = lisp_cdr(cur); + } else { + std::cerr << "Unknown token '" << iter.item() << "' in reset-points.\n"; } } } // read objects - { - lisp_object_t* cur = 0; - if(reader.read_lisp("objects", cur)) { - while(!lisp_nil_p(cur)) { - lisp_object_t* data = lisp_car(cur); - std::string object_type = lisp_symbol(lisp_car(data)); - - LispReader reader(lisp_cdr(data)); - - GameObject* object = parse_object(object_type, reader); - if(object) { - add_object(object); - } else { - std::cerr << "Unknown object '" << object_type << "' in level.\n"; - } - - cur = lisp_cdr(cur); + const lisp::Lisp* objects = reader.get_lisp("objects"); + if(objects) { + lisp::ListIterator iter(objects); + while(iter.next()) { + GameObject* object = parse_object(iter.item(), *(iter.lisp())); + if(object) { + add_object(object); + } else { + std::cerr << "Unknown object '" << iter.item() << "' in level.\n"; } } } @@ -338,21 +324,6 @@ Sector::fix_old_tiles() if(tile->getID() == 112) { add_object(new InvisibleBlock(pos)); solids->change(x, y, 0); - } else if(tile->getID() == 1311) { - add_object(new InvisibleTile(pos)); - solids->change(x, y, 0); - } else if(tile->getID() == 295) { - add_object(new Spike(pos, Spike::NORTH)); - solids->change(x, y, 0); - } else if(tile->getID() == 296) { - add_object(new Spike(pos, Spike::EAST)); - solids->change(x, y, 0); - } else if(tile->getID() == 297) { - add_object(new Spike(pos, Spike::SOUTH)); - solids->change(x, y, 0); - } else if(tile->getID() == 298) { - add_object(new Spike(pos, Spike::WEST)); - solids->change(x, y, 0); } else if(tile->getAttributes() & Tile::COIN) { add_object(new Coin(pos)); solids->change(x, y, 0); @@ -363,7 +334,8 @@ Sector::fix_old_tiles() add_object(new Brick(pos, tile->getData())); solids->change(x, y, 0); } else if(tile->getAttributes() & Tile::GOAL) { - add_object(new SequenceTrigger(pos, "endsequence")); + std::string sequence = tile->getData() == 0 ? "endsequence" : "stoptux"; + add_object(new SequenceTrigger(pos, sequence)); solids->change(x, y, 0); } } @@ -371,7 +343,7 @@ Sector::fix_old_tiles() } void -Sector::write(LispWriter& writer) +Sector::write(lisp::Writer& writer) { writer.write_string("name", name); writer.write_float("gravity", gravity); @@ -422,23 +394,6 @@ Sector::add_object(GameObject* object) void Sector::activate(const std::string& spawnpoint) { - _current = this; - - // Apply bonuses from former levels - switch (player_status.bonus) - { - case PlayerStatus::NO_BONUS: - break; - - case PlayerStatus::FLOWER_BONUS: - player->got_power = Player::FIRE_POWER; // FIXME: add ice power to here - // fall through - - case PlayerStatus::GROWUP_BONUS: - player->grow(false); - break; - } - SpawnPoint* sp = 0; for(SpawnPoints::iterator i = spawnpoints.begin(); i != spawnpoints.end(); ++i) { @@ -446,37 +401,56 @@ Sector::activate(const std::string& spawnpoint) sp = *i; break; } - } + } if(!sp) { std::cerr << "Spawnpoint '" << spawnpoint << "' not found.\n"; + if(spawnpoint != "main") { + activate("main"); + } else { + activate(Vector(0, 0)); + } } else { - player->move(sp->pos); + activate(sp->pos); } - camera->reset(player->get_pos()); + // Run init script + if(init_script != "") { + ScriptInterpreter::add_script_object(this, + std::string("Sector(") + name + ") - init", init_script); + } } -Vector -Sector::get_best_spawn_point(Vector pos) +void +Sector::activate(const Vector& player_pos) { - Vector best_reset_point = Vector(-1,-1); + _current = this; - for(SpawnPoints::iterator i = spawnpoints.begin(); i != spawnpoints.end(); - ++i) { - if((*i)->name != "main") - continue; - if((*i)->pos.x > best_reset_point.x && (*i)->pos.x < pos.x) - best_reset_point = (*i)->pos; - } + player->move(player_pos); + camera->reset(player->get_pos()); +} - return best_reset_point; +Rect +Sector::get_active_region() +{ + return Rect( + camera->get_translation() - Vector(1600, 1200), + camera->get_translation() + Vector(1600, 1200)); } void -Sector::action(float elapsed_time) +Sector::update(float elapsed_time) { player->check_bounds(camera); - + +#if 0 + CollisionGridIterator iter(*grid, get_active_region()); + while(MovingObject* object = iter.next()) { + if(!object->is_valid()) + continue; + + object->update(elapsed_time); + } +#else /* update objects */ for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) { @@ -484,9 +458,10 @@ Sector::action(float elapsed_time) if(!object->is_valid()) continue; - object->action(elapsed_time); + object->update(elapsed_time); } - +#endif + /* Handle all possible collisions. */ collision_handler(); update_game_objects(); @@ -498,29 +473,46 @@ Sector::update_game_objects() /** cleanup marked objects */ for(std::vector::iterator i = gameobjects.begin(); i != gameobjects.end(); /* nothing */) { - if((*i)->is_valid() == false) { - Bullet* bullet = dynamic_cast (*i); - if(bullet) { - bullets.erase( - std::remove(bullets.begin(), bullets.end(), bullet), - bullets.end()); - } - delete *i; - i = gameobjects.erase(i); - } else { + GameObject* object = *i; + + if(object->is_valid()) { ++i; + continue; } + + Bullet* bullet = dynamic_cast (object); + if(bullet) { + bullets.erase( + 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); } /* add newly created objects */ for(std::vector::iterator i = gameobjects_new.begin(); i != gameobjects_new.end(); ++i) { - Bullet* bullet = dynamic_cast (*i); + GameObject* object = *i; + + Bullet* bullet = dynamic_cast (object); if(bullet) bullets.push_back(bullet); - TileMap* tilemap = dynamic_cast (*i); +#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()) { if(solids == 0) { solids = tilemap; @@ -529,7 +521,7 @@ Sector::update_game_objects() } } - Camera* camera = dynamic_cast (*i); + Camera* camera = dynamic_cast (object); if(camera) { if(this->camera != 0) { std::cerr << "Warning: Multiple cameras added. Ignoring."; @@ -538,7 +530,7 @@ Sector::update_game_objects() this->camera = camera; } - gameobjects.push_back(*i); + gameobjects.push_back(object); } gameobjects_new.clear(); } @@ -548,7 +540,16 @@ Sector::draw(DrawingContext& context) { context.push_transform(); context.set_translation(camera->get_translation()); - + +#if 0 + CollisionGridIterator iter(*grid, get_active_region()); + while(MovingObject* object = iter.next()) { + if(!object->is_valid()) + continue; + + object->draw(context); + } +#else for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) { GameObject* object = *i; @@ -557,6 +558,7 @@ Sector::draw(DrawingContext& context) object->draw(context); } +#endif context.pop_transform(); } @@ -598,19 +600,25 @@ Sector::collision_tilemap(MovingObject* object, int depth) int max_x = int(x2+1); int max_y = int(y2+1); - CollisionHit temphit, hit; - Rectangle dest = object->get_bbox(); + TilemapCollisionHit temphit, hit; + Rect dest = object->get_bbox(); dest.move(object->movement); + hit.tileflags = 0; hit.time = -1; // represents an invalid value for(int x = starttilex; x*32 < max_x; ++x) { for(int y = starttiley; y*32 < max_y; ++y) { const Tile* tile = solids->get_tile(x, y); if(!tile) continue; - if(!(tile->getAttributes() & Tile::SOLID)) - continue; - if((tile->getAttributes() & Tile::UNISOLID) && object->movement.y < 0) + // skip non-solid tiles + if(tile->getAttributes() == 0) continue; + // only handle unisolid when the player is falling down and when he was + // above the tile before + if(tile->getAttributes() & Tile::UNISOLID) { + if(object->movement.y < 0 || object->get_bbox().p2.y > y*32) + continue; + } if(tile->getAttributes() & Tile::SLOPE) { // slope tile AATriangle triangle; @@ -620,22 +628,28 @@ Sector::collision_tilemap(MovingObject* object, int depth) if(Collision::rectangle_aatriangle(temphit, dest, object->movement, triangle)) { - if(temphit.time > hit.time) + hit.tileflags |= tile->getAttributes(); + if(temphit.time > hit.time && (tile->getAttributes() & Tile::SOLID)) { + temphit.tileflags = hit.tileflags; hit = temphit; + } } } else { // normal rectangular tile - Rectangle rect(x*32, y*32, (x+1)*32, (y+1)*32); + Rect rect(x*32, y*32, (x+1)*32, (y+1)*32); if(Collision::rectangle_rectangle(temphit, dest, object->movement, rect)) { - if(temphit.time > hit.time) + hit.tileflags |= tile->getAttributes(); + if(temphit.time > hit.time && (tile->getAttributes() & Tile::SOLID)) { + temphit.tileflags = hit.tileflags; hit = temphit; + } } } } } // did we collide at all? - if(hit.time < 0) + if(hit.tileflags == 0) return; // call collision function @@ -656,9 +670,9 @@ void Sector::collision_object(MovingObject* object1, MovingObject* object2) { CollisionHit hit; - Rectangle dest1 = object1->get_bbox(); + Rect dest1 = object1->get_bbox(); dest1.move(object1->get_movement()); - Rectangle dest2 = object2->get_bbox(); + Rect dest2 = object2->get_bbox(); dest2.move(object2->get_movement()); Vector movement = object1->get_movement() - object2->get_movement(); @@ -687,6 +701,9 @@ Sector::collision_object(MovingObject* object1, MovingObject* object2) void Sector::collision_handler() { +#ifdef USE_GRID + grid->check_collisions(); +#else for(std::vector::iterator i = gameobjects.begin(); i != gameobjects.end(); ++i) { GameObject* gameobject = *i; @@ -722,29 +739,31 @@ Sector::collision_handler() movingobject->bbox.move(movingobject->get_movement()); movingobject->movement = Vector(0, 0); } +#endif } bool Sector::add_bullet(const Vector& pos, float xm, Direction dir) { - if(player->got_power == Player::FIRE_POWER) { + // TODO remove this function and move these checks elsewhere... + static const size_t MAX_FIRE_BULLETS = 2; + static const size_t MAX_ICE_BULLETS = 1; + + Bullet* new_bullet = 0; + if(player_status->bonus == FIRE_BONUS) { if(bullets.size() > MAX_FIRE_BULLETS-1) return false; - } else if(player->got_power == Player::ICE_POWER) { + new_bullet = new Bullet(pos, xm, dir, FIRE_BULLET); + } else if(player_status->bonus == ICE_BONUS) { if(bullets.size() > MAX_ICE_BULLETS-1) return false; - } - - Bullet* new_bullet = 0; - if(player->got_power == Player::FIRE_POWER) - new_bullet = new Bullet(pos, xm, dir, FIRE_BULLET); - else if(player->got_power == Player::ICE_POWER) new_bullet = new Bullet(pos, xm, dir, ICE_BULLET); - else - throw std::runtime_error("wrong bullet type."); + } else { + return false; + } add_object(new_bullet); - SoundManager::get()->play_sound(IDToSound(SND_SHOOT)); + sound_manager->play("sounds/shoot.wav"); return true; } @@ -763,49 +782,23 @@ Sector::add_floating_text(const Vector& pos, const std::string& text) } void -Sector::load_music() -{ - char* song_path; - char* song_subtitle; - - level_song = SoundManager::get()->load_music(datadir + "/music/" + song_title); - - song_path = (char *) malloc(sizeof(char) * datadir.length() + - strlen(song_title.c_str()) + 8 + 5); - song_subtitle = strdup(song_title.c_str()); - strcpy(strstr(song_subtitle, "."), "\0"); - sprintf(song_path, "%s/music/%s-fast%s", datadir.c_str(), - song_subtitle, strstr(song_title.c_str(), ".")); - if(!SoundManager::get()->exists_music(song_path)) { - level_song_fast = level_song; - } else { - level_song_fast = SoundManager::get()->load_music(song_path); - } - free(song_subtitle); - free(song_path); -} - -void -Sector::play_music(int type) +Sector::play_music(MusicType type) { currentmusic = type; switch(currentmusic) { - case HURRYUP_MUSIC: - SoundManager::get()->play_music(level_song_fast); - break; case LEVEL_MUSIC: - SoundManager::get()->play_music(level_song); + sound_manager->play_music(std::string("music/") + song_title); break; case HERRING_MUSIC: - SoundManager::get()->play_music(herring_song); + sound_manager->play_music("music/salcon.ogg"); break; default: - SoundManager::get()->halt_music(); + sound_manager->play_music(""); break; } } -int +MusicType Sector::get_music_type() { return currentmusic; @@ -815,19 +808,18 @@ int Sector::get_total_badguys() { int total_badguys = 0; -#if 0 - for(GameObjects::iterator i = gameobjects_new.begin(); i != gameobjects_new.end(); ++i) - { + for(GameObjects::iterator i = gameobjects.begin(); + i != gameobjects.end(); ++i) { BadGuy* badguy = dynamic_cast (*i); - if(badguy) + if (badguy && badguy->countMe) total_badguys++; - } -#endif + } + return total_badguys; } bool -Sector::inside(const Rectangle& rect) const +Sector::inside(const Rect& rect) const { if(rect.p1.x > solids->get_width() * 32 || rect.p1.y > solids->get_height() * 32