- Change ScriptInterpreter to a gameobject, so we can now have several script

[supertux.git] / src / sector.cpp

diff --git a/src/sector.cpp b/src/sector.cpp
index dfb2679..80f76c8 100644 (file)
--- a/src/sector.cpp
+++ b/src/sector.cpp
@@ -52,6 +52,7 @@
 #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 +60,7 @@
 #include "scripting/script_interpreter.h"
 #include "scripting/sound.h"
 #include "scripting/scripted_object.h"
+#include "scripting/text.h"
 
 //#define USE_GRID
 
@@ -66,7 +68,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);
@@ -420,35 +422,13 @@ 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(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";
     }
@@ -475,9 +455,6 @@ Sector::get_active_region()
 void
 Sector::action(float elapsed_time)
 {
-  if(interpreter)
-    interpreter->update();
-  
   player->check_bounds(camera);
 
 #if 0