summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-12-30 02:06:53 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-12-30 02:06:53 (GMT)
commit5b21f4a66c77dbeaceb54b7a3ce3cde5efd7af3f (patch)
tree3000d7b1d85f6a031181454377f2c0920d319868 /includes
parent86369670aaa11b8cd2ddcbd46413fb9482e4e58f (diff)
parentf04577598b48c9e294b102395afc94023df8c92c (diff)
downloadpowder-5b21f4a66c77dbeaceb54b7a3ce3cde5efd7af3f.zip
powder-5b21f4a66c77dbeaceb54b7a3ce3cde5efd7af3f.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'includes')
-rw-r--r--includes/luaconsole.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/includes/luaconsole.h b/includes/luaconsole.h
index fc5e2c4..e559482 100644
--- a/includes/luaconsole.h
+++ b/includes/luaconsole.h
@@ -19,6 +19,11 @@
#define LUACON_KDOWN 1
#define LUACON_KUP 2
+//Bitmasks for things that might need recalculating after changes to tpt.el
+#define LUACON_EL_MODIFIED_CANMOVE 0x1
+#define LUACON_EL_MODIFIED_GRAPHICS 0x2
+#define LUACON_EL_MODIFIED_MENUS 0x4
+
int *lua_el_func, *lua_el_mode;
void luacon_open();
@@ -39,7 +44,7 @@ int luacon_transitionread(lua_State* l);
int luacon_transitionwrite(lua_State* l);
int luacon_particle_getproperty(char * key, int * format);
int luacon_transition_getproperty(char * key, int * format);
-int luacon_element_getproperty(char * key, int * format);
+int luacon_element_getproperty(char * key, int * format, unsigned int * modified_stuff);
int process_command_lua(pixel *vid_buf, char *console, char *console_error);
int getPartIndex_curIdx;