diff options
| author | jacob1 <jfu614@gmail.com> | 2012-08-10 19:53:16 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-08-10 19:56:57 (GMT) |
| commit | 54895a7ab29b43b439e5bfdcf27f8e414102d478 (patch) | |
| tree | b7c9a465525371abceb97cd59eaafa6dfe51d18a /src/console.c | |
| parent | 70dff3bb9af21952858c0ae068286858b44292ca (diff) | |
| download | powder-54895a7ab29b43b439e5bfdcf27f8e414102d478.zip powder-54895a7ab29b43b439e5bfdcf27f8e414102d478.tar.gz | |
Fix setting ctype names in old console
Diffstat (limited to 'src/console.c')
| -rw-r--r-- | src/console.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/console.c b/src/console.c index bad37b3..55ca358 100644 --- a/src/console.c +++ b/src/console.c @@ -535,28 +535,38 @@ int process_command_old(pixel *vid_buf, char *console, char *console_error) { if (strcmp(console4, "all")==0) { - j = atoi(console5); + if (console_parse_type(console5, &j, console_error) || (j = atoi(console5)) || !strcmp(console5,"0") || !strcasecmp(console5,"NONE")) + { + strcpy(console_error, ""); for (i=0; i<NPART; i++) { if (parts[i].type) parts[i].ctype = j; } + } } else if (console_parse_type(console4, &j, console_error)) { - k = atoi(console5); - for (i=0; i<NPART; i++) + if (console_parse_type(console5, &k, console_error) || (k = atoi(console5)) || !strcmp(console5,"0") || !strcasecmp(console5,"NONE")) { - if (parts[i].type == j) - parts[i].ctype = k; + strcpy(console_error, ""); + for (i=0; i<NPART; i++) + { + if (parts[i].type == j) + parts[i].ctype = k; + } } } else { if (console_parse_partref(console4, &i, console_error)) { - j = atoi(console5); - parts[i].ctype = j; + if (console_parse_type(console5, &j, console_error) || (j = atoi(console5)) || !strcmp(console5,"0") || !strcasecmp(console5,"NONE")) + { + strcpy(console_error, ""); + j = atoi(console5); + parts[i].ctype = j; + } } } } |