From 9b51b138db7ccc8dbc55ca200f1a4aff688f6d89 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 26 Dec 2011 21:19:29 +0100
Subject: KYRA: Some formatting fixes.

---
 engines/kyra/script_lok.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'engines/kyra/script_lok.cpp')

diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp
index ae6fb4b5e5..135925afd9 100644
--- a/engines/kyra/script_lok.cpp
+++ b/engines/kyra/script_lok.cpp
@@ -326,7 +326,7 @@ int KyraEngine_LoK::o1_delaySecs(EMCState *script) {
 	} else {
 		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_delaySecs(%p) (%d)", (const void *)script, stackPos(0));
 		if (stackPos(0) >= 0 && !skipFlag())
-			delay(stackPos(0)*1000, true);
+			delay(stackPos(0) * 1000, true);
 	}
 
 	resetSkipFlag();
@@ -689,7 +689,7 @@ int KyraEngine_LoK::o1_displayWSASequentialFrames(EMCState *script) {
 		if (specialTime) {
 			uint32 voiceTime = snd_getVoicePlayTime();
 			if (voiceTime) {
-				int displayFrames = ABS(endFrame-startFrame)+1;
+				int displayFrames = ABS(endFrame - startFrame) + 1;
 				displayFrames *= maxTime;
 				assert(displayFrames != 0);
 
@@ -1085,7 +1085,7 @@ int KyraEngine_LoK::o1_sceneAnimationActive(EMCState *script) {
 
 int KyraEngine_LoK::o1_setCharacterMovementDelay(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharacterMovementDelay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
-	_timer->setDelay(stackPos(0)+5, stackPos(1));
+	_timer->setDelay(stackPos(0) + 5, stackPos(1));
 	return 0;
 }
 
@@ -1124,7 +1124,7 @@ int KyraEngine_LoK::o1_findBrightestFireberry(EMCState *script) {
 	// return a glow value of "29" over here, when we are running a CD version.
 	if (_flags.isTalkie) {
 		if (_currentCharacter->sceneId == 133 || _currentCharacter->sceneId == 137 ||
-			_currentCharacter->sceneId == 165 || _currentCharacter->sceneId == 173)
+		        _currentCharacter->sceneId == 165 || _currentCharacter->sceneId == 173)
 			return 29;
 	}
 
@@ -1173,7 +1173,7 @@ int KyraEngine_LoK::o1_setFireberryGlowPalette(EMCState *script) {
 		case -1:
 			// The original seemed to draw some lines on page 2 here, which looks strange...
 			//if (!(_brandonStatusBit & 2))
-			//	warning("Unimplemented case for o1_setFireberryGlowPalette");
+			//  warning("Unimplemented case for o1_setFireberryGlowPalette");
 			palIndex = 9;
 			break;
 
@@ -1190,7 +1190,7 @@ int KyraEngine_LoK::o1_setFireberryGlowPalette(EMCState *script) {
 			palIndex = 9;
 			break;
 
-		case 28: case 29: default:
+	case 28: case 29: default:
 			palIndex = 6;
 		}
 
@@ -1227,8 +1227,8 @@ int KyraEngine_LoK::o1_setFireberryGlowPalette(EMCState *script) {
 
 		if (_brandonStatusBit & 2) {
 			if (_currentCharacter->sceneId != 133 && _currentCharacter->sceneId != 137 &&
-				_currentCharacter->sceneId != 165 && _currentCharacter->sceneId != 173 &&
-				(_currentCharacter->sceneId < 187 || _currentCharacter->sceneId > 198)) {
+			        _currentCharacter->sceneId != 165 && _currentCharacter->sceneId != 173 &&
+			        (_currentCharacter->sceneId < 187 || _currentCharacter->sceneId > 198)) {
 				palIndex = 14;
 			}
 		}
@@ -1291,12 +1291,12 @@ int KyraEngine_LoK::o1_drawItemShapeIntoScene(EMCState *script) {
 		flags = 1;
 
 	if (onlyHidPage) {
-		_screen->drawShape(2, _shapes[216+item], x, y, 0, flags);
+		_screen->drawShape(2, _shapes[216 + item], x, y, 0, flags);
 	} else {
 		_screen->hideMouse();
 		_animator->restoreAllObjectBackgrounds();
-		_screen->drawShape(2, _shapes[216+item], x, y, 0, flags);
-		_screen->drawShape(0, _shapes[216+item], x, y, 0, flags);
+		_screen->drawShape(2, _shapes[216 + item], x, y, 0, flags);
+		_screen->drawShape(0, _shapes[216 + item], x, y, 0, flags);
 		_animator->flagAllObjectsForBkgdChange();
 		_animator->preserveAnyChangedBackgrounds();
 		_animator->flagAllObjectsForRefresh();
@@ -1409,7 +1409,7 @@ int KyraEngine_LoK::o1_fillFlaskWithWater(EMCState *script) {
 
 int KyraEngine_LoK::o1_getCharacterMovementDelay(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharacterMovementDelay(%p) (%d)", (const void *)script, stackPos(0));
-	return _timer->getDelay(stackPos(0)+5);
+	return _timer->getDelay(stackPos(0) + 5);
 }
 
 int KyraEngine_LoK::o1_getBirthstoneGem(EMCState *script) {
@@ -1715,13 +1715,13 @@ int KyraEngine_LoK::o1_pauseMusicSeconds(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_pauseMusicSeconds(%p) ()", (const void *)script);
 	// if music disabled
 	//     return
-	delay(stackPos(0)*1000, true);
+	delay(stackPos(0) * 1000, true);
 	return 0;
 }
 
 int KyraEngine_LoK::o1_resetMaskRegion(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_resetMaskRegion(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
-	_screen->fillRect(stackPos(1), stackPos(2), stackPos(1)+stackPos(3), stackPos(2)+stackPos(4), 0, 5);
+	_screen->fillRect(stackPos(1), stackPos(2), stackPos(1) + stackPos(3), stackPos(2) + stackPos(4), 0, 5);
 	return 0;
 }
 
@@ -1754,7 +1754,7 @@ typedef Common::Functor1Mem<EMCState *, int, KyraEngine_LoK> OpcodeV1;
 #define SetOpcodeTable(x) table = &x;
 #define Opcode(x) table->push_back(new OpcodeV1(this, &KyraEngine_LoK::x))
 void KyraEngine_LoK::setupOpcodeTable() {
-	Common::Array<const Opcode*> *table = 0;
+	Common::Array<const Opcode *> *table = 0;
 
 	_opcodes.reserve(157);
 	SetOpcodeTable(_opcodes);
-- 
cgit v1.2.3