X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.cpp;h=2464ccc833ac2e9460db4357cfed32e39c20be38;hb=cde3a617070bee8af4ddcf58122cf6a65b97d874;hp=00a853876f0b90ab441a9776703111d63d1838af;hpb=495f8b77cb935fe8eff81bec755efca8e34e8a99;p=supertux.git diff --git a/src/sector.cpp b/src/sector.cpp index 00a853876..2464ccc83 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,39 +23,45 @@ #include #include #include +#include #include -#include "app/globals.h" -#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 "gameloop.h" -#include "resources.h" -#include "statistics.h" -#include "collision_grid.h" -#include "collision_grid_iterator.h" -#include "object_factory.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/bullet.h" -#include "badguy/jumpy.h" -#include "badguy/spike.h" -#include "trigger/sequence_trigger.h" -#include "player_status.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 @@ -66,11 +71,15 @@ Sector::Sector() : gravity(10), player(0), solids(0), camera(0), currentmusic(LEVEL_MUSIC) { - song_title = "Mortimers_chipdisko.mod"; - player = new Player(&player_status); + 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() @@ -108,6 +117,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); @@ -139,15 +156,11 @@ 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); } else { GameObject* object = parse_object(token, *(iter.lisp())); if(object) { @@ -157,14 +170,16 @@ Sector::parse(const lisp::Lisp& sector) } update_game_objects(); + + if(!solids) + throw std::runtime_error("sector does not contain a solid tile layer."); + fix_old_tiles(); if(!camera) { std::cerr << "sector '" << name << "' does not contain a camera.\n"; 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(); } @@ -188,16 +203,16 @@ Sector::parse_old_format(const lisp::Lisp& reader) 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; + bkgd_top.red = static_cast (r) / 255.0f; + bkgd_top.green = static_cast (g) / 255.0f; + bkgd_top.blue = static_cast (b) / 255.0f; 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; + bkgd_bottom.red = static_cast (r) / 255.0f; + bkgd_bottom.green = static_cast (g) / 255.0f; + bkgd_bottom.blue = static_cast (b) / 255.0f; if(backgroundimage != "") { Background* background = new Background; @@ -227,11 +242,10 @@ 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; + int width = 30, height = 15; reader.get("width", width); reader.get("height", height); @@ -294,10 +308,12 @@ Sector::parse_old_format(const lisp::Lisp& reader) add_object(camera); update_game_objects(); + + if(solids == 0) + throw std::runtime_error("sector does not contain a solid tile layer."); + fix_old_tiles(); update_game_objects(); - if(solids == 0) - throw std::runtime_error("sector does not contain a solid tile layer."); } void @@ -312,18 +328,6 @@ Sector::fix_old_tiles() if(tile->getID() == 112) { add_object(new InvisibleBlock(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); @@ -338,7 +342,7 @@ Sector::fix_old_tiles() add_object(new SequenceTrigger(pos, sequence)); solids->change(x, y, 0); } - } + } } } @@ -412,6 +416,12 @@ Sector::activate(const std::string& spawnpoint) } else { activate(sp->pos); } + + // Run init script + if(init_script != "") { + ScriptInterpreter::add_script_object(this, + std::string("Sector(") + name + ") - init", init_script); + } } void @@ -423,16 +433,16 @@ Sector::activate(const Vector& player_pos) camera->reset(player->get_pos()); } -Rectangle +Rect Sector::get_active_region() { - return Rectangle( + 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); @@ -442,7 +452,7 @@ Sector::action(float elapsed_time) if(!object->is_valid()) continue; - object->action(elapsed_time); + object->update(elapsed_time); } #else /* update objects */ @@ -452,7 +462,7 @@ Sector::action(float elapsed_time) if(!object->is_valid()) continue; - object->action(elapsed_time); + object->update(elapsed_time); } #endif @@ -480,10 +490,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); } @@ -498,9 +510,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()) { @@ -590,19 +604,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; @@ -612,22 +632,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 @@ -648,9 +674,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(); @@ -728,11 +754,11 @@ Sector::add_bullet(const Vector& pos, float xm, Direction dir) static const size_t MAX_ICE_BULLETS = 1; Bullet* new_bullet = 0; - if(player_status.bonus == FIRE_BONUS) { + if(player_status->bonus == FIRE_BONUS) { if(bullets.size() > MAX_FIRE_BULLETS-1) return false; new_bullet = new Bullet(pos, xm, dir, FIRE_BULLET); - } else if(player_status.bonus == ICE_BONUS) { + } else if(player_status->bonus == ICE_BONUS) { if(bullets.size() > MAX_ICE_BULLETS-1) return false; new_bullet = new Bullet(pos, xm, dir, ICE_BULLET); @@ -741,7 +767,7 @@ Sector::add_bullet(const Vector& pos, float xm, Direction dir) } add_object(new_bullet); - SoundManager::get()->play_sound(IDToSound(SND_SHOOT)); + sound_manager->play("sounds/shoot.wav"); return true; } @@ -760,49 +786,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,7 +815,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++; } @@ -823,7 +823,7 @@ Sector::get_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