updated squirrel version

[supertux.git] / src / sector.cpp

diff --git a/src/sector.cpp b/src/sector.cpp
index d911c4a..e9c35c1 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -32,7 +32,7 @@
 #include "object/camera.h"
 #include "object/background.h"
 #include "object/particlesystem.h"
-#include "object/particlesystem_absolute.h"
+#include "object/particlesystem_interactive.h"
 #include "object/tilemap.h"
 #include "lisp/parser.h"
 #include "lisp/lisp.h"
@@ -72,11 +72,15 @@ Sector::Sector()
   : gravity(10), player(0), solids(0), camera(0),
     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()
@@ -114,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);
@@ -145,7 +157,6 @@ 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") {
       SpawnPoint* sp = new SpawnPoint(iter.lisp());
       spawnpoints.push_back(sp);
@@ -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,19 +428,8 @@ Sector::activate(const std::string& spawnpoint)
 
   // Run init script
   if(init_script != "") {
-    try {
-      ScriptInterpreter* interpreter 
-        = new ScriptInterpreter(GameSession::current()->get_working_directory());
-      interpreter->register_sector(this);
-      std::string sourcename = std::string("Sector(") + name + ") - init";
-      std::istringstream in(init_script);
-      interpreter->load_script(in, sourcename);
-      interpreter->start_script();
-      add_object(interpreter);
-      init_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);
   }
 }
 
@@ -500,10 +499,12 @@ Sector::update_game_objects()
           std::remove(bullets.begin(), bullets.end(), bullet),
           bullets.end());
     }
+#ifdef USE_GRID
     MovingObject* movingobject = dynamic_cast<MovingObject*> (object);
     if(movingobject) {
       grid->remove_object(movingobject);
     }
+#endif
     delete *i;
     i = gameobjects.erase(i);
   }
@@ -518,9 +519,11 @@ Sector::update_game_objects()
     if(bullet)
       bullets.push_back(bullet);
 
+#ifdef USE_GRID
     MovingObject* movingobject = dynamic_cast<MovingObject*> (object);
     if(movingobject)
       grid->add_object(movingobject);
+#endif
     
     TileMap* tilemap = dynamic_cast<TileMap*> (object);
     if(tilemap && tilemap->is_solid()) {
@@ -766,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.wav");
 
   return true;
 }
@@ -785,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;
   }
 }
@@ -821,7 +817,7 @@ Sector::get_total_badguys()
   for(GameObjects::iterator i = gameobjects.begin();
       i != gameobjects.end(); ++i) {
     BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
-    if(badguy)
+    if (badguy && badguy->countMe)
       total_badguys++;
   }