summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorJacob1 <jfu614@gmail.com>2012-05-24 00:08:53 (GMT)
committer Jacob1 <jfu614@gmail.com>2012-05-24 00:08:53 (GMT)
commitbe2fe943c049d479bec9c476e196037678e05b32 (patch)
tree0344a7fa848353d560c45a85a0949a34a12aba50 /includes
parentb9439454360fa5f1b340459aca44597e24f21489 (diff)
downloadpowder-be2fe943c049d479bec9c476e196037678e05b32.zip
powder-be2fe943c049d479bec9c476e196037678e05b32.tar.gz
Prevent accidental infinite loops in lua
Also fix glitch when step_functions[0] is unregistered but others aren't
Diffstat (limited to 'includes')
-rw-r--r--includes/defines.h1
-rw-r--r--includes/luaconsole.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/includes/defines.h b/includes/defines.h
index 28cdbd2..bb57b8e 100644
--- a/includes/defines.h
+++ b/includes/defines.h
@@ -189,6 +189,7 @@ extern int ngrav_enable;
int limitFPS;
int water_equal_test;
extern int quickoptions_tooltip_fade;
+extern int loop_time;
extern int debug_flags;
#define DEBUG_PERF_FRAMECOUNT 256
diff --git a/includes/luaconsole.h b/includes/luaconsole.h
index 83fa405..ce8f6b1 100644
--- a/includes/luaconsole.h
+++ b/includes/luaconsole.h
@@ -62,6 +62,7 @@ int luacon_particle_getproperty(char * key, int * format);
int luacon_transition_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);
+void lua_hook(lua_State *L, lua_Debug *ar);
int getPartIndex_curIdx;