1 files changed, 68 insertions, 70 deletions

diff --git a/engines/glk/alan3/act.cpp b/engines/glk/alan3/act.cpp
index cc1fe92fc3..1b92234397 100644
--- a/engines/glk/alan3/act.cpp
+++ b/engines/glk/alan3/act.cpp
@@ -32,93 +32,91 @@ namespace Glk {
 namespace Alan3 {
 
 /*----------------------------------------------------------------------*/
-static void executeCommand(int verb, Parameter parameters[])
-{
-    static AltInfo *altInfos = NULL; /* Need to survive lots of different exits...*/
-    int altIndex;
-
-    /* Did we leave anything behind last time... */
-    if (altInfos != NULL)
-        free(altInfos);
-
-    altInfos = findAllAlternatives(verb, parameters);
-
-    if (anyCheckFailed(altInfos, EXECUTE_CHECK_BODY_ON_FAIL))
-        return;
-
-    /* Check for anything to execute... */
-    if (!anythingToExecute(altInfos))
-        error(M_CANT0);
-
-    /* Now perform actions! First try any BEFORE or ONLY from inside out */
-    for (altIndex = lastAltInfoIndex(altInfos); altIndex >= 0; altIndex--) {
-        if (altInfos[altIndex].alt != 0) // TODO Can this ever be NULL? Why?
-            if (altInfos[altIndex].alt->qual == (Aword)Q_BEFORE
-                || altInfos[altIndex].alt->qual == (Aword)Q_ONLY) {
-                if (!executedOk(&altInfos[altIndex]))
-                    abortPlayerCommand();
-                if (altInfos[altIndex].alt->qual == (Aword)Q_ONLY)
-                    return;
-            }
-    }
-        
-    /* Then execute any not declared as AFTER, i.e. the default */
-    for (altIndex = 0; !altInfos[altIndex].end; altIndex++) {
-        if (altInfos[altIndex].alt != 0)
-            if (altInfos[altIndex].alt->qual != (Aword)Q_AFTER)
-                if (!executedOk(&altInfos[altIndex]))
-                    abortPlayerCommand();
-    }
-        
-    /* Finally, the ones declared as AFTER */
-    for (altIndex = lastAltInfoIndex(altInfos); altIndex >= 0; altIndex--) {
-        if (altInfos[altIndex].alt != 0)
-            if (!executedOk(&altInfos[altIndex]))
-                abortPlayerCommand();
-    }
+static void executeCommand(int verb, Parameter parameters[]) {
+	static AltInfo *altInfos = NULL; /* Need to survive lots of different exits...*/
+	int altIndex;
+
+	/* Did we leave anything behind last time... */
+	if (altInfos != NULL)
+		free(altInfos);
+
+	altInfos = findAllAlternatives(verb, parameters);
+
+	if (anyCheckFailed(altInfos, EXECUTE_CHECK_BODY_ON_FAIL))
+		return;
+
+	/* Check for anything to execute... */
+	if (!anythingToExecute(altInfos))
+		error(M_CANT0);
+
+	/* Now perform actions! First try any BEFORE or ONLY from inside out */
+	for (altIndex = lastAltInfoIndex(altInfos); altIndex >= 0; altIndex--) {
+		if (altInfos[altIndex].alt != 0) // TODO Can this ever be NULL? Why?
+			if (altInfos[altIndex].alt->qual == (Aword)Q_BEFORE
+			        || altInfos[altIndex].alt->qual == (Aword)Q_ONLY) {
+				if (!executedOk(&altInfos[altIndex]))
+					abortPlayerCommand();
+				if (altInfos[altIndex].alt->qual == (Aword)Q_ONLY)
+					return;
+			}
+	}
+
+	/* Then execute any not declared as AFTER, i.e. the default */
+	for (altIndex = 0; !altInfos[altIndex].end; altIndex++) {
+		if (altInfos[altIndex].alt != 0)
+			if (altInfos[altIndex].alt->qual != (Aword)Q_AFTER)
+				if (!executedOk(&altInfos[altIndex]))
+					abortPlayerCommand();
+	}
+
+	/* Finally, the ones declared as AFTER */
+	for (altIndex = lastAltInfoIndex(altInfos); altIndex >= 0; altIndex--) {
+		if (altInfos[altIndex].alt != 0)
+			if (!executedOk(&altInfos[altIndex]))
+				abortPlayerCommand();
+	}
 }
 
 
 /*======================================================================
- 
+
   action()
- 
+
   Execute the command. Handles acting on multiple items
   such as ALL, THEM or lists of objects.
- 
+
 */
-void action(int verb, Parameter parameters[], Parameter multipleMatches[])
-{
-    int multiplePosition;
+void action(int verb, Parameter parameters[], Parameter multipleMatches[]) {
+	int multiplePosition;
 #ifdef TODO
 	char marker[10];
 #endif
 
-    multiplePosition = findMultiplePosition(parameters);
-    if (multiplePosition != -1) {
+	multiplePosition = findMultiplePosition(parameters);
+	if (multiplePosition != -1) {
 #ifdef TODO
 		jmp_buf savedReturnLabel;
-        memcpy(savedReturnLabel, returnLabel, sizeof(returnLabel));
-        sprintf(marker, "($%d)", multiplePosition+1); /* Prepare a printout with $1/2/3 */
-        for (int i = 0; !isEndOfArray(&multipleMatches[i]); i++) {
-            copyParameter(&parameters[multiplePosition], &multipleMatches[i]);
-            setGlobalParameters(parameters); /* Need to do this here since the marker use them */
-            output(marker);
-            // TODO: if execution for one parameter aborts we should return here, not to top level
-            if (setjmp(returnLabel) == NO_JUMP_RETURN)
-                executeCommand(verb, parameters);
-            if (multipleMatches[i+1].instance != EOD)
-                para();
-        }
-        memcpy(returnLabel, savedReturnLabel, sizeof(returnLabel));
-        parameters[multiplePosition].instance = 0;
+		memcpy(savedReturnLabel, returnLabel, sizeof(returnLabel));
+		sprintf(marker, "($%d)", multiplePosition + 1); /* Prepare a printout with $1/2/3 */
+		for (int i = 0; !isEndOfArray(&multipleMatches[i]); i++) {
+			copyParameter(&parameters[multiplePosition], &multipleMatches[i]);
+			setGlobalParameters(parameters); /* Need to do this here since the marker use them */
+			output(marker);
+			// TODO: if execution for one parameter aborts we should return here, not to top level
+			if (setjmp(returnLabel) == NO_JUMP_RETURN)
+				executeCommand(verb, parameters);
+			if (multipleMatches[i + 1].instance != EOD)
+				para();
+		}
+		memcpy(returnLabel, savedReturnLabel, sizeof(returnLabel));
+		parameters[multiplePosition].instance = 0;
 #else
 		::error("TODO: action");
 #endif
-    } else {
-        setGlobalParameters(parameters);
-        executeCommand(verb, parameters);
-    }
+	} else {
+		setGlobalParameters(parameters);
+		executeCommand(verb, parameters);
+	}
 
 }