fix

[supertux.git] / src / sector.cpp

diff --git a/src/sector.cpp b/src/sector.cpp
index 80f76c8..cb7a2d9 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -32,6 +32,7 @@
 #include "object/camera.h"
 #include "object/background.h"
 #include "object/particlesystem.h"
+#include "object/particlesystem_interactive.h"
 #include "object/tilemap.h"
 #include "lisp/parser.h"
 #include "lisp/lisp.h"
@@ -46,6 +47,7 @@
 #include "collision_grid_iterator.h"
 #include "object_factory.h"
 #include "collision.h"
+#include "spawn_point.h"
 #include "math/rect.h"
 #include "math/aatriangle.h"
 #include "object/coin.h"
@@ -112,6 +114,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,12 +155,7 @@ Sector::parse(const lisp::Lisp& sector)
       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);
@@ -421,17 +426,8 @@ Sector::activate(const std::string& spawnpoint)
 
   // Run init script
   if(init_script != "") {
-    try {
-      ScriptInterpreter* interpreter = new ScriptInterpreter(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);
   }
 }
 
@@ -453,7 +449,7 @@ Sector::get_active_region()
 }
 
 void
-Sector::action(float elapsed_time)
+Sector::update(float elapsed_time)
 {
   player->check_bounds(camera);
 
@@ -463,7 +459,7 @@ Sector::action(float elapsed_time)
     if(!object->is_valid())
       continue;
 
-    object->action(elapsed_time);
+    object->update(elapsed_time);
   }
 #else
   /* update objects */
@@ -473,7 +469,7 @@ Sector::action(float elapsed_time)
     if(!object->is_valid())
       continue;
     
-    object->action(elapsed_time);
+    object->update(elapsed_time);
   }
 #endif
   
@@ -788,8 +784,7 @@ 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));
+  level_song = sound_manager->load_music("/music/" + song_title);
 }
 
 void
@@ -822,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++;
   }