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

Do not implicitly set extensions of script files.

Browse Source
This commit is contained in:
Faerbit 2015-02-15 19:34:15 +01:00
parent fb028a899f
commit efa151aa73
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/levels/Level1.xml
View File

@ -1332,7 +1332,7 @@
<distance>0.2</distance> <distance>0.2</distance>
<isBiggerThan>true</isBiggerThan> <isBiggerThan>true</isBiggerThan>
<objectNum>0</objectNum> <objectNum>0</objectNum>
<luaScript>openFirstDoor</luaScript> <luaScript>openFirstDoor.lua</luaScript>
<toChangeIdGreen>1</toChangeIdGreen> <toChangeIdGreen>1</toChangeIdGreen>
<toChangeIdBlue>133</toChangeIdBlue> <toChangeIdBlue>133</toChangeIdBlue>
<toChangeObjNum>0</toChangeObjNum> <toChangeObjNum>0</toChangeObjNum>
@ -1347,7 +1347,7 @@
<distance>0.2</distance> <distance>0.2</distance>
<isBiggerThan>false</isBiggerThan> <isBiggerThan>false</isBiggerThan>
<objectNum>0</objectNum> <objectNum>0</objectNum>
<luaScript>openFirstDoorUndo</luaScript> <luaScript>openFirstDoorUndo.lua</luaScript>
<toChangeIdGreen>1</toChangeIdGreen> <toChangeIdGreen>1</toChangeIdGreen>
<toChangeIdBlue>133</toChangeIdBlue> <toChangeIdBlue>133</toChangeIdBlue>
<toChangeObjNum>0</toChangeObjNum> <toChangeObjNum>0</toChangeObjNum>

2
trigger.cc
View File

@ -5,7 +5,7 @@ Trigger::Trigger(glm::vec3 position, float distance, bool isBigger, Object* obje
this->distance=distance; this->distance=distance;
this->isBigger=isBigger; this->isBigger=isBigger;
this->object=object; this->object=object;
this->luaScript= scriptPath + luaScript + ".lua"; this->luaScript= scriptPath + luaScript;
this->L = L; this->L = L;
if(L == nullptr){ if(L == nullptr){
printf("L is NULL in trigger!\n"); printf("L is NULL in trigger!\n");