diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-01-26 17:15:02 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-01-26 17:15:02 (GMT) |
| commit | 8e689fdd080ff24b9beb68852ff9b7c74594f119 (patch) | |
| tree | 0260bce01d5e49427c6cfc364845b1f9e8c0c1d4 /src/cat/LuaScriptInterface.cpp | |
| parent | 3e60181dbe8fe291c27f909738a8210111557665 (diff) | |
| parent | 46b767da0c14745a6cd807637249ec0b5b57b8f1 (diff) | |
| download | powder-8e689fdd080ff24b9beb68852ff9b7c74594f119.zip powder-8e689fdd080ff24b9beb68852ff9b7c74594f119.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/cat/LuaScriptInterface.cpp')
| -rw-r--r-- | src/cat/LuaScriptInterface.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cat/LuaScriptInterface.cpp b/src/cat/LuaScriptInterface.cpp index d24dc85..e4bf3c2 100644 --- a/src/cat/LuaScriptInterface.cpp +++ b/src/cat/LuaScriptInterface.cpp @@ -315,6 +315,7 @@ tpt.partsdata = nil"); for(i = 0; i < PT_NUM; i++) { lua_el_mode[i] = 0; + lua_gr_func[i] = 0; } } @@ -1163,7 +1164,6 @@ int LuaScriptInterface::elements_element(lua_State * l) if(lua_type(l, -1) == LUA_TFUNCTION) { lua_gr_func[id] = luaL_ref(l, LUA_REGISTRYINDEX); - luacon_sim->elements[id].Graphics = &luacon_graphicsReplacement; } else if(lua_type(l, -1) == LUA_TBOOLEAN && !lua_toboolean(l, -1)) { @@ -1332,7 +1332,6 @@ int LuaScriptInterface::elements_property(lua_State * l) { lua_pushvalue(l, 3); lua_gr_func[id] = luaL_ref(l, LUA_REGISTRYINDEX); - luacon_sim->elements[id].Graphics = &luacon_graphicsReplacement; } else if(lua_type(l, 3) == LUA_TBOOLEAN && !lua_toboolean(l, -1)) { |