diff options
| author | Simon Robertshaw <simon@Simons-Mac-Pro.local> | 2012-04-30 20:49:40 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@Simons-Mac-Pro.local> | 2012-04-30 20:49:40 (GMT) |
| commit | 211770e8189b426287adad3d924c20cac203fbd1 (patch) | |
| tree | 51b335ff8e73a4bbfb017a0de4dc7c2f68be05dd /src/console.c | |
| parent | 8397b6e51aa817f2b33347bc801fdaee0b4d2700 (diff) | |
| parent | 433c1881bc37ea257999b88eee920c19a92798c5 (diff) | |
| download | powder-211770e8189b426287adad3d924c20cac203fbd1.zip powder-211770e8189b426287adad3d924c20cac203fbd1.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/console.c')
| -rw-r--r-- | src/console.c | 47 |
1 files changed, 39 insertions, 8 deletions
diff --git a/src/console.c b/src/console.c index 6d8ffe2..40807c9 100644 --- a/src/console.c +++ b/src/console.c @@ -340,7 +340,7 @@ int process_command_old(pixel *vid_buf, char *console, char *console_error) } } } - if (strcmp(console3, "type")==0) + else if (strcmp(console3, "type")==0) { if (strcmp(console4, "all")==0) { @@ -369,7 +369,7 @@ int process_command_old(pixel *vid_buf, char *console, char *console_error) } } } - if (strcmp(console3, "temp")==0) + else if (strcmp(console3, "temp")==0) { if (strcmp(console4, "all")==0) { @@ -398,7 +398,7 @@ int process_command_old(pixel *vid_buf, char *console, char *console_error) } } } - if (strcmp(console3, "tmp")==0) + else if (strcmp(console3, "tmp")==0) { if (strcmp(console4, "all")==0) { @@ -427,7 +427,36 @@ int process_command_old(pixel *vid_buf, char *console, char *console_error) } } } - if (strcmp(console3, "x")==0) + else if (strcmp(console3, "tmp2")==0) + { + if (strcmp(console4, "all")==0) + { + j = atoi(console5); + for (i=0; i<NPART; i++) + { + if (parts[i].type) + parts[i].tmp2 = j; + } + } + else if (console_parse_type(console4, &j, console_error)) + { + k = atoi(console5); + for (i=0; i<NPART; i++) + { + if (parts[i].type == j) + parts[i].tmp2 = k; + } + } + else + { + if (console_parse_partref(console4, &i, console_error)) + { + j = atoi(console5); + parts[i].tmp2 = j; + } + } + } + else if (strcmp(console3, "x")==0) { if (strcmp(console4, "all")==0) { @@ -456,7 +485,7 @@ int process_command_old(pixel *vid_buf, char *console, char *console_error) } } } - if (strcmp(console3, "y")==0) + else if (strcmp(console3, "y")==0) { if (strcmp(console4, "all")==0) { @@ -485,7 +514,7 @@ int process_command_old(pixel *vid_buf, char *console, char *console_error) } } } - if (strcmp(console3, "ctype")==0) + else if (strcmp(console3, "ctype")==0) { if (strcmp(console4, "all")==0) { @@ -514,7 +543,7 @@ int process_command_old(pixel *vid_buf, char *console, char *console_error) } } } - if (strcmp(console3, "vx")==0) + else if (strcmp(console3, "vx")==0) { if (strcmp(console4, "all")==0) { @@ -543,7 +572,7 @@ int process_command_old(pixel *vid_buf, char *console, char *console_error) } } } - if (strcmp(console3, "vy")==0) + else if (strcmp(console3, "vy")==0) { if (strcmp(console4, "all")==0) { @@ -572,6 +601,8 @@ int process_command_old(pixel *vid_buf, char *console, char *console_error) } } } + else + strcpy(console_error, "Invalid property"); } else strcpy(console_error, "Invalid Command"); |