diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-11 11:45:49 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-11 11:45:49 (GMT) |
| commit | ecbb1e910352aec1cda4e2d4c36cf3599bc43963 (patch) | |
| tree | 80607199b466cbf16d275a4718aa51fe73a3c160 /src/cat/LuaScriptHelper.h | |
| parent | 2f76c2374d9d8da0b3ed512113a611c9af5653b5 (diff) | |
| download | powder-ecbb1e910352aec1cda4e2d4c36cf3599bc43963.zip powder-ecbb1e910352aec1cda4e2d4c36cf3599bc43963.tar.gz | |
Lua element and graphics functions working (element_func no longer uses "replace" parameter and replaces all functions)
Diffstat (limited to 'src/cat/LuaScriptHelper.h')
| -rw-r--r-- | src/cat/LuaScriptHelper.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/cat/LuaScriptHelper.h b/src/cat/LuaScriptHelper.h index 2577333..8b2d9fa 100644 --- a/src/cat/LuaScriptHelper.h +++ b/src/cat/LuaScriptHelper.h @@ -12,11 +12,12 @@ GameModel * luacon_model; Simulation * luacon_sim; LuaScriptInterface * luacon_ci; Graphics * luacon_g; +Renderer * luacon_ren; bool *luacon_currentCommand; string *luacon_lastError; -int *lua_el_func, *lua_el_mode; +int *lua_el_func, *lua_el_mode, *lua_gr_func; int getPartIndex_curIdx; int step_functions[6];//[6] = {0, 0, 0, 0, 0, 0}; @@ -29,7 +30,6 @@ int tptPropertiesVersion; int tptElements; //Table for TPT element names int tptParts, tptPartsMeta, tptElementTransitions, tptPartsCData, tptPartMeta, tptPart, cIndex; - int luacon_step(int mx, int my, int selectl, int selectr, int bsx, int bsy); int luacon_mouseevent(int mx, int my, int mb, int event, int mouse_wheel); int luacon_keyevent(int key, int modifier, int event); @@ -53,7 +53,13 @@ int luacon_element_getproperty(char * key, int * format, unsigned int * modified //Interface int luatpt_test(lua_State* l); int luatpt_getelement(lua_State *l); + +int luacon_graphicsReplacement(GRAPHICS_FUNC_ARGS); +int luatpt_graphics_func(lua_State *l); + +int luacon_elementReplacement(UPDATE_FUNC_ARGS); int luatpt_element_func(lua_State *l); + int luatpt_error(lua_State* l); int luatpt_drawtext(lua_State* l); |
