summaryrefslogtreecommitdiff
path: root/src/console.c
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-12-18 15:14:07 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-12-18 15:14:07 (GMT)
commit61e86ca72d83dbd8494303245b28530fbc488f78 (patch)
tree75841218a685ceed4665ea4283e600b863fc1a70 /src/console.c
parent33271ce3e29a0cea246e32e823388db7a8f39abc (diff)
parent58b9996958c9dbe2800872659bf4c745c1450e3e (diff)
downloadpowder-61e86ca72d83dbd8494303245b28530fbc488f78.zip
powder-61e86ca72d83dbd8494303245b28530fbc488f78.tar.gz
Merge with new lua functionality
Diffstat (limited to 'src/console.c')
-rw-r--r--src/console.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/console.c b/src/console.c
index c9714a1..6d8ffe2 100644
--- a/src/console.c
+++ b/src/console.c
@@ -20,14 +20,14 @@ int console_parse_type(char *txt, int *element, char *err)
else if (strcasecmp(txt,"NONE")==0) i = PT_NONE;
if (i>=0 && i<PT_NUM && ptypes[i].enabled)
{
- *element = i;
+ if (element) *element = i;
if (err) strcpy(err,"");
return 1;
}
for (i=1; i<PT_NUM; i++) {
if (strcasecmp(txt,ptypes[i].name)==0 && ptypes[i].enabled)
{
- *element = i;
+ if (element) *element = i;
if (err) strcpy(err,"");
return 1;
}