faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Added an errorcheck when loading lua files.

Browse Source
This commit is contained in:
Steffen Fündgens 2015-03-06 13:18:55 +01:00
parent eac0031b0a
commit 2c191c75a5
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
trigger.cc
View File

@ -27,22 +27,30 @@ Trigger::~Trigger(){
} }
void Trigger::triggerUpdate(){ void Trigger::triggerUpdate(){
if (isBigger && (glm::distance(object->getPosition(), position) > distance)) { if (isBigger && (glm::distance(object->getPosition(), position) > distance)) {
luaL_dofile(luaState, luaScript.c_str()); int error = luaL_dofile(luaState, luaScript.c_str());
if (undo){ if (error != 0) {
luabridge::getGlobal(luaState, "triggerUndo")(objectToChange); std::cout << "Couldn't load file: " << this->luaScript << std::endl;
}else{ exit(-1);
luabridge::getGlobal(luaState, "trigger")(objectToChange);
}
} }
else if (!isBigger && (glm::distance(object->getPosition(), position) < distance)) { if (undo){
luaL_dofile(luaState, luaScript.c_str()); luabridge::getGlobal(luaState, "triggerUndo")(objectToChange);
if (undo){ }else{
luabridge::getGlobal(luaState, "triggerUndo")(objectToChange); luabridge::getGlobal(luaState, "trigger")(objectToChange);
}else{
luabridge::getGlobal(luaState, "trigger")(objectToChange);
}
} }
}
else if (!isBigger && (glm::distance(object->getPosition(), position) < distance)) {
int error = luaL_dofile(luaState, luaScript.c_str());
if (error != 0) {
std::cout << "Couldn't load file: " << this->luaScript << std::endl;
exit(-1);
}
if (undo){
luabridge::getGlobal(luaState, "triggerUndo")(objectToChange);
}else{
luabridge::getGlobal(luaState, "trigger")(objectToChange);
}
}
} }
bool Trigger::deleteNotification(int deletedObjectIndex){ bool Trigger::deleteNotification(int deletedObjectIndex){