mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20280) -Fix: indentation of some switch cases

release/1.1
rubidium 2010-08-01 18:48:00 +00:00
parent dc6ed2c2c0
commit 605f6d0ed3
1 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/console.cpp
View File

@ -327,52 +327,59 @@ static void IConsoleAliasExec(const IConsoleAlias *alias, byte tokencount, char
if (a_index >= lengthof(aliases) || astream_i >= lengthof(aliasstream)) break; if (a_index >= lengthof(aliases) || astream_i >= lengthof(aliasstream)) break;
switch (*cmdptr) { switch (*cmdptr) {
case '\'': // ' will double for "" case '\'': // ' will double for ""
aliasstream[astream_i++] = '"'; aliasstream[astream_i++] = '"';
break; break;
case ';': // Cmd seperator, start new command
aliasstream[astream_i] = '\0'; case ';': // Cmd seperator, start new command
aliases[++a_index] = &aliasstream[++astream_i]; aliasstream[astream_i] = '\0';
cmdptr++; aliases[++a_index] = &aliasstream[++astream_i];
break; cmdptr++;
case '%': // Some or all parameters break;
cmdptr++;
switch (*cmdptr) { case '%': // Some or all parameters
case '+': { // All parameters seperated: "[param 1]" "[param 2]" cmdptr++;
for (i = 0; i != tokencount; i++) { switch (*cmdptr) {
aliasstream[astream_i++] = '"'; case '+': { // All parameters seperated: "[param 1]" "[param 2]"
astream_i += IConsoleCopyInParams(&aliasstream[astream_i], tokens[i], astream_i); for (i = 0; i != tokencount; i++) {
aliasstream[astream_i++] = '"'; aliasstream[astream_i++] = '"';
aliasstream[astream_i++] = ' '; astream_i += IConsoleCopyInParams(&aliasstream[astream_i], tokens[i], astream_i);
aliasstream[astream_i++] = '"';
aliasstream[astream_i++] = ' ';
}
break;
}
case '!': { // Merge the parameters to one: "[param 1] [param 2] [param 3...]"
aliasstream[astream_i++] = '"';
for (i = 0; i != tokencount; i++) {
astream_i += IConsoleCopyInParams(&aliasstream[astream_i], tokens[i], astream_i);
aliasstream[astream_i++] = ' ';
}
aliasstream[astream_i++] = '"';
break;
}
default: { // One specific parameter: %A = [param 1] %B = [param 2] ...
int param = *cmdptr - 'A';
if (param < 0 || param >= tokencount) {
IConsoleError("too many or wrong amount of parameters passed to alias, aborting");
IConsolePrintF(CC_WARNING, "Usage of alias '%s': %s", alias->name, alias->cmdline);
return;
}
aliasstream[astream_i++] = '"';
astream_i += IConsoleCopyInParams(&aliasstream[astream_i], tokens[param], astream_i);
aliasstream[astream_i++] = '"';
break;
}
} }
} break; break;
case '!': { // Merge the parameters to one: "[param 1] [param 2] [param 3...]"
aliasstream[astream_i++] = '"';
for (i = 0; i != tokencount; i++) {
astream_i += IConsoleCopyInParams(&aliasstream[astream_i], tokens[i], astream_i);
aliasstream[astream_i++] = ' ';
}
aliasstream[astream_i++] = '"';
} break; default:
default: { // One specific parameter: %A = [param 1] %B = [param 2] ... aliasstream[astream_i++] = *cmdptr;
int param = *cmdptr - 'A'; break;
if (param < 0 || param >= tokencount) {
IConsoleError("too many or wrong amount of parameters passed to alias, aborting");
IConsolePrintF(CC_WARNING, "Usage of alias '%s': %s", alias->name, alias->cmdline);
return;
}
aliasstream[astream_i++] = '"';
astream_i += IConsoleCopyInParams(&aliasstream[astream_i], tokens[param], astream_i);
aliasstream[astream_i++] = '"';
} break;
} break;
default:
aliasstream[astream_i++] = *cmdptr;
break;
} }
} }