summaryrefslogtreecommitdiff
path: root/src/console.c
diff options
context:
space:
mode:
authorjacksonmj <mj-pt@jacksonmj.co.uk>2011-07-22 19:33:36 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-07-24 12:07:15 (GMT)
commit7ed0255f04f494e914b724cf5614f4f1d343069a (patch)
tree2949a549d709088a977905abd2f71c6193dec250 /src/console.c
parentae9fca86ee7dd1ea2a781dee6f2f4727ac094e2b (diff)
downloadpowder-7ed0255f04f494e914b724cf5614f4f1d343069a.zip
powder-7ed0255f04f494e914b724cf5614f4f1d343069a.tar.gz
Disable old life elements
Diffstat (limited to 'src/console.c')
-rw-r--r--src/console.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/console.c b/src/console.c
index e4551d0..f6ddeb7 100644
--- a/src/console.c
+++ b/src/console.c
@@ -12,23 +12,18 @@ int file_script = 0;
int console_parse_type(char *txt, int *element, char *err)
{
int i = -1;
- if (strcasecmp(txt,"WIND")==0)
- {
- if (err) strcpy(err, "Particle type not recognised");
- return 0;
- }
// alternative names for some elements
if (strcasecmp(txt,"C4")==0) i = PT_PLEX;
else if (strcasecmp(txt,"C5")==0) i = PT_C5;
else if (strcasecmp(txt,"NONE")==0) i = PT_NONE;
- if (i>=0)
+ if (i>=0 && i<PT_NUM && ptypes[i].enabled)
{
*element = i;
if (err) strcpy(err,"");
return 1;
}
for (i=1; i<PT_NUM; i++) {
- if (strcasecmp(txt,ptypes[i].name)==0)
+ if (strcasecmp(txt,ptypes[i].name)==0 && ptypes[i].enabled)
{
*element = i;
if (err) strcpy(err,"");