projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lots of cool scripting stuff
[supertux.git]
/
src
/
scripting
/
script_interpreter.cpp
diff --git
a/src/scripting/script_interpreter.cpp
b/src/scripting/script_interpreter.cpp
index
eb53a0c
..
af17653
100644
(file)
--- a/
src/scripting/script_interpreter.cpp
+++ b/
src/scripting/script_interpreter.cpp
@@
-23,6
+23,7
@@
#include "object/text_object.hpp"
#include "object/scripted_object.hpp"
#include "object/display_effect.hpp"
#include "object/text_object.hpp"
#include "object/scripted_object.hpp"
#include "object/display_effect.hpp"
+#include "object/player.hpp"
#include "scripting/sound.hpp"
#include "scripting/scripted_object.hpp"
#include "scripting/display_effect.hpp"
#include "scripting/sound.hpp"
#include "scripting/scripted_object.hpp"
#include "scripting/display_effect.hpp"
@@
-89,6
+90,7
@@
ScriptInterpreter::register_sector(Sector* sector)
expose_object(scripted_object, scripted_object->get_name());
}
expose_object(scripted_object, scripted_object->get_name());
}
+ expose_object(static_cast<Scripting::Player*> (sector->player), "Tux");
TextObject* text_object = new TextObject();
sector->add_object(text_object);
Scripting::Text* text = static_cast<Scripting::Text*> (text_object);
TextObject* text_object = new TextObject();
sector->add_object(text_object);
Scripting::Text* text = static_cast<Scripting::Text*> (text_object);
@@
-183,7
+185,7
@@
ScriptInterpreter::add_script_object(Sector* sector, const std::string& name,
// load global default.nut file if it exists
//TODO: Load all .nut files from that directory
try {
// load global default.nut file if it exists
//TODO: Load all .nut files from that directory
try {
- std::string filename = "
data/
script/default.nut";
+ std::string filename = "script/default.nut";
IFileStream in(filename);
interpreter->run_script(in, filename, false);
} catch(std::exception& e) {
IFileStream in(filename);
interpreter->run_script(in, filename, false);
} catch(std::exception& e) {