// 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 <config.h>
#include <memory>
#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"
#include "player_status.h"
#include "scripting/script_interpreter.h"
+#include "scripting/sound.h"
+#include "scripting/scripted_object.h"
+#include "scripting/text.h"
//#define USE_GRID
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);
// 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();
+ 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";
}