created a ghost forest demo from contrib art:

[supertux.git] / src / sector.cpp

diff --git a/src/sector.cpp b/src/sector.cpp
index dfb2679..43743c7 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_absolute.h"
 #include "object/tilemap.h"
 #include "lisp/parser.h"
 #include "lisp/lisp.h"
@@ -46,12 +47,14 @@
 #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"
 #include "object/block.h"
 #include "object/invisible_block.h"
 #include "object/bullet.h"
+#include "object/text_object.h"
 #include "badguy/jumpy.h"
 #include "badguy/spike.h"
 #include "trigger/sequence_trigger.h"
@@ -59,6 +62,7 @@
 #include "scripting/script_interpreter.h"
 #include "scripting/sound.h"
 #include "scripting/scripted_object.h"
+#include "scripting/text.h"
 
 //#define USE_GRID
 
@@ -66,7 +70,7 @@ 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";
   player = new Player(&player_status);
@@ -110,6 +114,10 @@ Sector::parse_object(const std::string& name, const lisp::Lisp& reader)
     RainParticleSystem* partsys = new RainParticleSystem();
     partsys->parse(reader);
     return partsys;
+  } else if(name == "particles-ghost") {
+    GhostParticleSystem* partsys = new GhostParticleSystem();
+    partsys->parse(reader);
+    return partsys;
   } else if(name == "particles-clouds") {
     CloudParticleSystem* partsys = new CloudParticleSystem();
     partsys->parse(reader);
@@ -143,12 +151,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);
@@ -420,35 +423,15 @@ 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();
-
-      // expose ScriptedObjects to the script
-      for(GameObjects::iterator i = gameobjects.begin();
-          i != gameobjects.end(); ++i) {
-        GameObject* object = *i;
-        Scripting::ScriptedObject* scripted_object
-          = dynamic_cast<Scripting::ScriptedObject*> (object);
-        if(!scripted_object)
-          continue;
-
-        std::cout << "Exposing " << scripted_object->get_name() << "\n";
-        interpreter->expose_object(scripted_object,
-                                   scripted_object->get_name(),
-                                   "ScriptedObject");
-      }
-      Scripting::Sound* sound = new Scripting::Sound();
-      interpreter->expose_object(sound, "Sound", "Sound");
-
+      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);
-      printf("Load script.\n");
       interpreter->load_script(in, sourcename);
-      printf("run script.\n");
-      interpreter->run_script();
+      interpreter->start_script();
+      add_object(interpreter);
+      init_script = "";
     } catch(std::exception& e) {
       std::cerr << "Couldn't execute init script: " << e.what() << "\n";
     }
@@ -473,11 +456,8 @@ Sector::get_active_region()
 }
 
 void
-Sector::action(float elapsed_time)
+Sector::update(float elapsed_time)
 {
-  if(interpreter)
-    interpreter->update();
-  
   player->check_bounds(camera);
 
 #if 0
@@ -486,7 +466,7 @@ Sector::action(float elapsed_time)
     if(!object->is_valid())
       continue;
 
-    object->action(elapsed_time);
+    object->update(elapsed_time);
   }
 #else
   /* update objects */
@@ -496,7 +476,7 @@ Sector::action(float elapsed_time)
     if(!object->is_valid())
       continue;
     
-    object->action(elapsed_time);
+    object->update(elapsed_time);
   }
 #endif
   
@@ -845,7 +825,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++;
   }