cpp/openttd-patchpack/source Changeset - r15607:2d0c25dbce47

Changeset - r15607:2d0c25dbce47

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 14 years ago 2010-08-01 18:48:00
rubidium@openttd.org

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

1 file changed with 48 insertions and 41 deletions:

src/console.cpp

0 comments (0 inline, 0 general)

src/console.cpp

➞

Show inline comments

@@ @@ -327,52 +327,59 @@ static void IConsoleAliasExec(const ICon @@
 		if (a_index >= lengthof(aliases) || astream_i >= lengthof(aliasstream)) break;
 		switch (*cmdptr) {
 		case '\'': // ' will double for ""
 			aliasstream[astream_i++] = '"';
 			break;
 		case ';': // Cmd seperator, start new command
 			aliasstream[astream_i] = '\0';
 			aliases[++a_index] = &aliasstream[++astream_i];
 			cmdptr++;
 			break;
 		case '%': // Some or all parameters
 			cmdptr++;
 			switch (*cmdptr) {
 			case '+': { // All parameters seperated: "[param 1]" "[param 2]"
 				for (i = 0; i != tokencount; 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...]"
 			case '\'': // ' will double for ""
 				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;
 			case ';': // Cmd seperator, start new command
 				aliasstream[astream_i] = '\0';
 				aliases[++a_index] = &aliasstream[++astream_i];
 				cmdptr++;
 				break;
 			} break;
 				default: { // One specific parameter: %A = [param 1] %B = [param 2] ...
 				int param = *cmdptr - 'A';
 			case '%': // Some or all parameters
 				cmdptr++;
 				switch (*cmdptr) {
 					case '+': { // All parameters seperated: "[param 1]" "[param 2]"
 						for (i = 0; i != tokencount; i++) {
 							aliasstream[astream_i++] = '"';
 							astream_i += IConsoleCopyInParams(&aliasstream[astream_i], tokens[i], astream_i);
 							aliasstream[astream_i++] = '"';
 							aliasstream[astream_i++] = ' ';
+						}
 						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;
+				}
 					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';
 				aliasstream[astream_i++] = '"';
 				astream_i += IConsoleCopyInParams(&aliasstream[astream_i], tokens[param], astream_i);
 				aliasstream[astream_i++] = '"';
 			} break;
 			} 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;
+						}
 		default:
 			aliasstream[astream_i++] = *cmdptr;
 			break;
 						aliasstream[astream_i++] = '"';
 						astream_i += IConsoleCopyInParams(&aliasstream[astream_i], tokens[param], astream_i);
 						aliasstream[astream_i++] = '"';
 						break;
+					}
+				}
 				break;
 			default:
 				aliasstream[astream_i++] = *cmdptr;
 				break;
+		}
+	}

0 comments (0 inline, 0 general)