diff options
author | David Walter Seikel | 2012-02-05 13:15:10 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-02-05 13:15:10 +1000 |
commit | 184e5927bae42745232d59b6ba15b0052d2ec3a5 (patch) | |
tree | f9fbb2b710678d70555a27bbea287bf296b38f11 /LuaSL/src | |
parent | Turn on the script running stuff, clean out the now excess tests, then move t... (diff) | |
download | SledjHamr-184e5927bae42745232d59b6ba15b0052d2ec3a5.zip SledjHamr-184e5927bae42745232d59b6ba15b0052d2ec3a5.tar.gz SledjHamr-184e5927bae42745232d59b6ba15b0052d2ec3a5.tar.bz2 SledjHamr-184e5927bae42745232d59b6ba15b0052d2ec3a5.tar.xz |
Get them in the right order. lol
Diffstat (limited to '')
-rw-r--r-- | LuaSL/src/LuaSL.h | 2 | ||||
-rw-r--r-- | LuaSL/src/LuaSL_runner.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/LuaSL/src/LuaSL.h b/LuaSL/src/LuaSL.h index c35b394..0b831c8 100644 --- a/LuaSL/src/LuaSL.h +++ b/LuaSL/src/LuaSL.h | |||
@@ -61,8 +61,8 @@ boolean compilerSetup(gameGlobals *game); | |||
61 | boolean compileLSL(gameGlobals *game, char *script, boolean doConstants); | 61 | boolean compileLSL(gameGlobals *game, char *script, boolean doConstants); |
62 | 62 | ||
63 | void runnerSetup(gameGlobals *game); | 63 | void runnerSetup(gameGlobals *game); |
64 | void runnerTearDown(gameGlobals *game); | ||
65 | void runLuaFile(gameGlobals *game, const char *filename); | 64 | void runLuaFile(gameGlobals *game, const char *filename); |
65 | void runnerTearDown(gameGlobals *game); | ||
66 | 66 | ||
67 | void loggingStartup(gameGlobals *game); | 67 | void loggingStartup(gameGlobals *game); |
68 | char *getDateTime(struct tm **nowOut, char *dateOut, time_t *tiemOut); | 68 | char *getDateTime(struct tm **nowOut, char *dateOut, time_t *tiemOut); |
diff --git a/LuaSL/src/LuaSL_runner.c b/LuaSL/src/LuaSL_runner.c index 411c437..8aa115c 100644 --- a/LuaSL/src/LuaSL_runner.c +++ b/LuaSL/src/LuaSL_runner.c | |||
@@ -132,12 +132,6 @@ void runnerSetup(gameGlobals *game) | |||
132 | PE("Error creating luaproc worker thread."); | 132 | PE("Error creating luaproc worker thread."); |
133 | } | 133 | } |
134 | 134 | ||
135 | void runnerTearDown(gameGlobals *game) | ||
136 | { | ||
137 | // TODO - this is what hangs the system. | ||
138 | sched_join_workerthreads(); | ||
139 | } | ||
140 | |||
141 | void runLuaFile(gameGlobals *game, const char *filename) | 135 | void runLuaFile(gameGlobals *game, const char *filename) |
142 | { | 136 | { |
143 | newProc(filename, TRUE); | 137 | newProc(filename, TRUE); |
@@ -158,3 +152,9 @@ void runLuaFile(gameGlobals *game, const char *filename) | |||
158 | _edje_lua2_error(L, err); | 152 | _edje_lua2_error(L, err); |
159 | */ | 153 | */ |
160 | } | 154 | } |
155 | |||
156 | void runnerTearDown(gameGlobals *game) | ||
157 | { | ||
158 | // TODO - this is what hangs the system. | ||
159 | sched_join_workerthreads(); | ||
160 | } | ||