summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-12-19 12:38:50 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-12-19 12:38:50 (GMT)
commit12bf65f9543f23b152b2d066b8e6c77c632f788d (patch)
treee2732bfe37b68e257f04af4a70802c3f27a247a0 /src
parenta9914dca2fcbf237fcd91530644f637613cde78f (diff)
parentdee7dd9fb9d7f0c83bd3ecdbe609c11de89bf966 (diff)
downloadpowder-12bf65f9543f23b152b2d066b8e6c77c632f788d.zip
powder-12bf65f9543f23b152b2d066b8e6c77c632f788d.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src')
-rw-r--r--src/luaconsole.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/luaconsole.c b/src/luaconsole.c
index 57236af..072b67e 100644
--- a/src/luaconsole.c
+++ b/src/luaconsole.c
@@ -18,6 +18,7 @@ int tptParts, tptPartsMeta, tptElementTransitions;
void luacon_open(){
int i = 0, j;
char tmpname[12];
+ int currentElementMeta, currentElement;
const static struct luaL_reg tptluaapi [] = {
{"test", &luatpt_test},
{"drawtext", &luatpt_drawtext},
@@ -182,7 +183,6 @@ tpt.partsdata = nil");
tptElementTransitions = lua_gettop(l);
for(i = 1; i < PT_NUM; i++)
{
- int currentElementMeta, currentElement;
for(j = 0; j < strlen(ptypes[i].name); j++)
tmpname[j] = tolower(ptypes[i].name[j]);
tmpname[strlen(ptypes[i].name)] = 0;