#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"
#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);
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);
// 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";
}
}
void
-Sector::action(float elapsed_time)
+Sector::update(float elapsed_time)
{
- if(interpreter)
- interpreter->update();
-
player->check_bounds(camera);
#if 0
if(!object->is_valid())
continue;
- object->action(elapsed_time);
+ object->update(elapsed_time);
}
#else
/* update objects */
if(!object->is_valid())
continue;
- object->action(elapsed_time);
+ object->update(elapsed_time);
}
#endif