[Scummvm-cvs-logs] scummvm master -> 9b51b138db7ccc8dbc55ca200f1a4aff688f6d89

lordhoto lordhoto at gmail.com
Mon Dec 26 21:34:47 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9b51b138db KYRA: Some formatting fixes.


Commit: 9b51b138db7ccc8dbc55ca200f1a4aff688f6d89
    https://github.com/scummvm/scummvm/commit/9b51b138db7ccc8dbc55ca200f1a4aff688f6d89
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-12-26T12:34:22-08:00

Commit Message:
KYRA: Some formatting fixes.

Changed paths:
    engines/kyra/animator_lok.cpp
    engines/kyra/debugger.cpp
    engines/kyra/detection.cpp
    engines/kyra/gui_lok.cpp
    engines/kyra/gui_v1.cpp
    engines/kyra/items_lok.cpp
    engines/kyra/kyra_lok.cpp
    engines/kyra/kyra_v1.cpp
    engines/kyra/resource.cpp
    engines/kyra/resource_intern.cpp
    engines/kyra/saveload_lok.cpp
    engines/kyra/scene_lok.cpp
    engines/kyra/scene_v1.cpp
    engines/kyra/screen_lok.cpp
    engines/kyra/script_lok.cpp
    engines/kyra/script_v1.cpp
    engines/kyra/seqplayer.cpp
    engines/kyra/sequences_lok.cpp
    engines/kyra/staticres.cpp
    engines/kyra/text_lok.cpp
    engines/kyra/timer_lok.cpp
    engines/kyra/wsamovie.cpp



diff --git a/engines/kyra/animator_lok.cpp b/engines/kyra/animator_lok.cpp
index 4126681..c246eeb 100644
--- a/engines/kyra/animator_lok.cpp
+++ b/engines/kyra/animator_lok.cpp
@@ -100,7 +100,7 @@ void Animator_LoK::initAnimStateList() {
 	for (int i = 16; i < 28; ++i) {
 		animStates[i].index = i;
 		animStates[i].flags = 0;
-		animStates[i].background = _vm->_shapes[345+i];
+		animStates[i].background = _vm->_shapes[345 + i];
 		animStates[i].rectSize = _screen->getRectSize(3, 24);
 		animStates[i].width = 3;
 		animStates[i].height = 16;
@@ -352,10 +352,10 @@ void Animator_LoK::copyChangedObjectsForward(int refreshFlag) {
 		if (curObject->active) {
 			if (curObject->refreshFlag || refreshFlag) {
 				int xpos = 0, ypos = 0, width = 0, height = 0;
-				xpos = (curObject->x1>>3) - (curObject->width2>>3) - 1;
+				xpos = (curObject->x1 >> 3) - (curObject->width2 >> 3) - 1;
 				ypos = curObject->y1 - curObject->height2;
-				width = curObject->width + (curObject->width2>>3) + 2;
-				height = curObject->height + curObject->height2*2;
+				width = curObject->width + (curObject->width2 >> 3) + 2;
+				height = curObject->height + curObject->height2 * 2;
 
 				if (xpos < 1)
 					xpos = 1;
@@ -412,7 +412,7 @@ void Animator_LoK::animAddGameItem(int index, uint16 sceneId) {
 	animObj->refreshFlag = 1;
 	animObj->bkgdChangeFlag = 1;
 	animObj->drawY = currentRoom->itemsYPos[index];
-	animObj->sceneAnimPtr = _vm->_shapes[216+currentRoom->itemsTable[index]];
+	animObj->sceneAnimPtr = _vm->_shapes[216 + currentRoom->itemsTable[index]];
 	animObj->animFrameNumber = -1;
 	animObj->x1 = currentRoom->itemsXPos[index];
 	animObj->y1 = currentRoom->itemsYPos[index];
@@ -438,8 +438,8 @@ void Animator_LoK::animAddNPC(int character) {
 	animObj->bkgdChangeFlag = 1;
 	animObj->drawY = ch->y1;
 	animObj->sceneAnimPtr = _vm->_shapes[ch->currentAnimFrame];
-	animObj->x1 = animObj->x2 = ch->x1 + _vm->_defaultShapeTable[ch->currentAnimFrame-7].xOffset;
-	animObj->y1 = animObj->y2 = ch->y1 + _vm->_defaultShapeTable[ch->currentAnimFrame-7].yOffset;
+	animObj->x1 = animObj->x2 = ch->x1 + _vm->_defaultShapeTable[ch->currentAnimFrame - 7].xOffset;
+	animObj->y1 = animObj->y2 = ch->y1 + _vm->_defaultShapeTable[ch->currentAnimFrame - 7].yOffset;
 
 	if (ch->facing >= 1 && ch->facing <= 3)
 		animObj->flags |= 1;
@@ -543,13 +543,13 @@ void Animator_LoK::makeBrandonFaceMouse() {
 int16 Animator_LoK::fetchAnimWidth(const uint8 *shape, int16 mult) {
 	if (_vm->gameFlags().useAltShapeHeader)
 		shape += 2;
-	return (((int16)READ_LE_UINT16((shape+3))) * mult) >> 8;
+	return (((int16)READ_LE_UINT16((shape + 3))) * mult) >> 8;
 }
 
 int16 Animator_LoK::fetchAnimHeight(const uint8 *shape, int16 mult) {
 	if (_vm->gameFlags().useAltShapeHeader)
 		shape += 2;
-	return (int16)(((int8)*(shape+2)) * mult) >> 8;
+	return (int16)(((int8)*(shape + 2)) * mult) >> 8;
 }
 
 void Animator_LoK::setBrandonAnimSeqSize(int width, int height) {
@@ -603,8 +603,8 @@ void Animator_LoK::animRefreshNPC(int character) {
 		}
 	}
 
-	int xOffset = _vm->_defaultShapeTable[ch->currentAnimFrame-7].xOffset;
-	int yOffset = _vm->_defaultShapeTable[ch->currentAnimFrame-7].yOffset;
+	int xOffset = _vm->_defaultShapeTable[ch->currentAnimFrame - 7].xOffset;
+	int yOffset = _vm->_defaultShapeTable[ch->currentAnimFrame - 7].yOffset;
 
 	if (_vm->_scaleMode) {
 		animObj->x1 = ch->x1;
diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index 96003d9..95c6162 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -37,16 +37,16 @@ Debugger::Debugger(KyraEngine_v1 *vm)
 }
 
 void Debugger::initialize() {
-	DCmd_Register("continue",			WRAP_METHOD(Debugger, Cmd_Exit));
-	DCmd_Register("screen_debug_mode",	WRAP_METHOD(Debugger, cmd_setScreenDebug));
-	DCmd_Register("load_palette",		WRAP_METHOD(Debugger, cmd_loadPalette));
-	DCmd_Register("facings",			WRAP_METHOD(Debugger, cmd_showFacings));
-	DCmd_Register("gamespeed",			WRAP_METHOD(Debugger, cmd_gameSpeed));
-	DCmd_Register("flags",				WRAP_METHOD(Debugger, cmd_listFlags));
-	DCmd_Register("toggleflag",			WRAP_METHOD(Debugger, cmd_toggleFlag));
-	DCmd_Register("queryflag",			WRAP_METHOD(Debugger, cmd_queryFlag));
-	DCmd_Register("timers",				WRAP_METHOD(Debugger, cmd_listTimers));
-	DCmd_Register("settimercountdown",	WRAP_METHOD(Debugger, cmd_setTimerCountdown));
+	DCmd_Register("continue",           WRAP_METHOD(Debugger, Cmd_Exit));
+	DCmd_Register("screen_debug_mode",  WRAP_METHOD(Debugger, cmd_setScreenDebug));
+	DCmd_Register("load_palette",       WRAP_METHOD(Debugger, cmd_loadPalette));
+	DCmd_Register("facings",            WRAP_METHOD(Debugger, cmd_showFacings));
+	DCmd_Register("gamespeed",          WRAP_METHOD(Debugger, cmd_gameSpeed));
+	DCmd_Register("flags",              WRAP_METHOD(Debugger, cmd_listFlags));
+	DCmd_Register("toggleflag",         WRAP_METHOD(Debugger, cmd_toggleFlag));
+	DCmd_Register("queryflag",          WRAP_METHOD(Debugger, cmd_queryFlag));
+	DCmd_Register("timers",             WRAP_METHOD(Debugger, cmd_listTimers));
+	DCmd_Register("settimercountdown",  WRAP_METHOD(Debugger, cmd_setTimerCountdown));
 }
 
 bool Debugger::cmd_setScreenDebug(int argc, const char **argv) {
@@ -136,7 +136,7 @@ bool Debugger::cmd_gameSpeed(int argc, const char **argv) {
 }
 
 bool Debugger::cmd_listFlags(int argc, const char **argv) {
-	for (int i = 0, p = 0; i < (int)sizeof(_vm->_flagsTable)*8; i++, ++p) {
+	for (int i = 0, p = 0; i < (int)sizeof(_vm->_flagsTable) * 8; i++, ++p) {
 		DebugPrintf("(%-3i): %-2i", i, _vm->queryGameFlag(i));
 		if (p == 5) {
 			DebugPrintf("\n");
@@ -201,10 +201,10 @@ Debugger_LoK::Debugger_LoK(KyraEngine_LoK *vm)
 }
 
 void Debugger_LoK::initialize() {
-	DCmd_Register("enter",				WRAP_METHOD(Debugger_LoK, cmd_enterRoom));
-	DCmd_Register("scenes",				WRAP_METHOD(Debugger_LoK, cmd_listScenes));
-	DCmd_Register("give",				WRAP_METHOD(Debugger_LoK, cmd_giveItem));
-	DCmd_Register("birthstones",		WRAP_METHOD(Debugger_LoK, cmd_listBirthstones));
+	DCmd_Register("enter",              WRAP_METHOD(Debugger_LoK, cmd_enterRoom));
+	DCmd_Register("scenes",             WRAP_METHOD(Debugger_LoK, cmd_listScenes));
+	DCmd_Register("give",               WRAP_METHOD(Debugger_LoK, cmd_giveItem));
+	DCmd_Register("birthstones",        WRAP_METHOD(Debugger_LoK, cmd_listBirthstones));
 }
 
 bool Debugger_LoK::cmd_enterRoom(int argc, const char **argv) {
@@ -214,7 +214,7 @@ bool Debugger_LoK::cmd_enterRoom(int argc, const char **argv) {
 
 		// game will crash if entering a non-existent room
 		if (room >= _vm->_roomTableSize) {
-			DebugPrintf("room number must be any value between (including) 0 and %d\n", _vm->_roomTableSize-1);
+			DebugPrintf("room number must be any value between (including) 0 and %d\n", _vm->_roomTableSize - 1);
 			return true;
 		}
 
@@ -289,12 +289,12 @@ Debugger_v2::Debugger_v2(KyraEngine_v2 *vm) : Debugger(vm), _vm(vm) {
 }
 
 void Debugger_v2::initialize() {
-	DCmd_Register("character_info",		WRAP_METHOD(Debugger_v2, cmd_characterInfo));
-	DCmd_Register("enter",				WRAP_METHOD(Debugger_v2, cmd_enterScene));
-	DCmd_Register("scenes",				WRAP_METHOD(Debugger_v2, cmd_listScenes));
-	DCmd_Register("scene_info",			WRAP_METHOD(Debugger_v2, cmd_sceneInfo));
-	DCmd_Register("scene_to_facing",	WRAP_METHOD(Debugger_v2, cmd_sceneToFacing));
-	DCmd_Register("give",				WRAP_METHOD(Debugger_v2, cmd_giveItem));
+	DCmd_Register("character_info",     WRAP_METHOD(Debugger_v2, cmd_characterInfo));
+	DCmd_Register("enter",              WRAP_METHOD(Debugger_v2, cmd_enterScene));
+	DCmd_Register("scenes",             WRAP_METHOD(Debugger_v2, cmd_listScenes));
+	DCmd_Register("scene_info",         WRAP_METHOD(Debugger_v2, cmd_sceneInfo));
+	DCmd_Register("scene_to_facing",    WRAP_METHOD(Debugger_v2, cmd_sceneToFacing));
+	DCmd_Register("give",               WRAP_METHOD(Debugger_v2, cmd_giveItem));
 }
 
 bool Debugger_v2::cmd_enterScene(int argc, const char **argv) {
@@ -304,7 +304,7 @@ bool Debugger_v2::cmd_enterScene(int argc, const char **argv) {
 
 		// game will crash if entering a non-existent scene
 		if (scene >= _vm->_sceneListSize) {
-			DebugPrintf("scene number must be any value between (including) 0 and %d\n", _vm->_sceneListSize-1);
+			DebugPrintf("scene number must be any value between (including) 0 and %d\n", _vm->_sceneListSize - 1);
 			return true;
 		}
 
@@ -366,8 +366,8 @@ bool Debugger_v2::cmd_sceneInfo(int argc, const char **argv) {
 		DebugPrintf("This scene has %d special exits.\n", _vm->_specialExitCount);
 		for (int i = 0; i < _vm->_specialExitCount; ++i) {
 			DebugPrintf("SpecialExit%d: facing %d, position (x1/y1/x2/y2): %d/%d/%d/%d\n", i,
-					_vm->_specialExitTable[20+i], _vm->_specialExitTable[0+i], _vm->_specialExitTable[5+i],
-					_vm->_specialExitTable[10+i], _vm->_specialExitTable[15+i]);
+			            _vm->_specialExitTable[20 + i], _vm->_specialExitTable[0 + i], _vm->_specialExitTable[5 + i],
+			            _vm->_specialExitTable[10 + i], _vm->_specialExitTable[15 + i]);
 		}
 	}
 
@@ -444,7 +444,7 @@ Debugger_HoF::Debugger_HoF(KyraEngine_HoF *vm) : Debugger_v2(vm), _vm(vm) {
 }
 
 void Debugger_HoF::initialize() {
-	DCmd_Register("pass_codes",			WRAP_METHOD(Debugger_HoF, cmd_passcodes));
+	DCmd_Register("pass_codes",         WRAP_METHOD(Debugger_HoF, cmd_passcodes));
 }
 
 bool Debugger_HoF::cmd_passcodes(int argc, const char **argv) {
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 74c949b..1a4fd3b 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -45,7 +45,7 @@ struct KYRAGameDescription {
 
 namespace {
 
-const char * const directoryGlobs[] = {
+const char *const directoryGlobs[] = {
 	"malcolm",
 	0
 };
@@ -66,12 +66,12 @@ public:
 	const char *getOriginalCopyright() const {
 		return "The Legend of Kyrandia (C) Westwood Studios"
 #ifdef ENABLE_LOL
-				"\nLands of Lore (C) Westwood Studios"
+		       "\nLands of Lore (C) Westwood Studios"
 #endif
 #ifdef ENABLE_EOB
-				"\nEye of the Beholder (C) TSR, Inc., (C) Strategic Simulations, Inc."
+		       "\nEye of the Beholder (C) TSR, Inc., (C) Strategic Simulations, Inc."
 #endif
-		    ;
+		       ;
 	}
 
 	bool hasFeature(MetaEngineFeature f) const;
@@ -84,19 +84,19 @@ public:
 
 bool KyraMetaEngine::hasFeature(MetaEngineFeature f) const {
 	return
-		(f == kSupportsListSaves) ||
-		(f == kSupportsLoadingDuringStartup) ||
-		(f == kSupportsDeleteSave) ||
-		(f == kSavesSupportMetaInfo) ||
-		(f == kSavesSupportThumbnail);
+	    (f == kSupportsListSaves) ||
+	    (f == kSupportsLoadingDuringStartup) ||
+	    (f == kSupportsDeleteSave) ||
+	    (f == kSavesSupportMetaInfo) ||
+	    (f == kSavesSupportThumbnail);
 }
 
 bool Kyra::KyraEngine_v1::hasFeature(EngineFeature f) const {
 	return
-		(f == kSupportsRTL) ||
-		(f == kSupportsLoadingDuringRuntime) ||
-		(f == kSupportsSavingDuringRuntime) ||
-		(f == kSupportsSubtitleOptions);
+	    (f == kSupportsRTL) ||
+	    (f == kSupportsLoadingDuringRuntime) ||
+	    (f == kSupportsSavingDuringRuntime) ||
+	    (f == kSupportsSubtitleOptions);
 }
 
 bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
@@ -159,7 +159,7 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
 
 	Common::StringArray filenames;
 	filenames = saveFileMan->listSavefiles(pattern);
-	Common::sort(filenames.begin(), filenames.end());	// Sort (hopefully ensuring we are sorted numerically..)
+	Common::sort(filenames.begin(), filenames.end());   // Sort (hopefully ensuring we are sorted numerically..)
 
 	SaveStateList saveList;
 	for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); ++file) {
@@ -189,7 +189,9 @@ SaveStateList KyraMetaEngine::listSaves(const char *target) const {
 	return saveList;
 }
 
-int KyraMetaEngine::getMaximumSaveSlot() const { return 999; }
+int KyraMetaEngine::getMaximumSaveSlot() const {
+	return 999;
+}
 
 void KyraMetaEngine::removeSaveState(const char *target, int slot) const {
 	// In Kyra games slot 0 can't be deleted, it's for restarting the game(s).
diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp
index 2a2828d..18470e5 100644
--- a/engines/kyra/gui_lok.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -62,7 +62,7 @@ int KyraEngine_LoK::buttonInventoryCallback(Button *caller) {
 			snd_playSoundEffect(0x35);
 			_screen->hideMouse();
 			_screen->fillRect(_itemPosX[itemOffset], _itemPosY[itemOffset], _itemPosX[itemOffset] + 15, _itemPosY[itemOffset] + 15, _flags.platform == Common::kPlatformAmiga ? 19 : 12);
-			_screen->drawShape(0, _shapes[216+_itemInHand], _itemPosX[itemOffset], _itemPosY[itemOffset], 0, 0);
+			_screen->drawShape(0, _shapes[216 + _itemInHand], _itemPosX[itemOffset], _itemPosY[itemOffset], 0, 0);
 			setMouseItem(inventoryItem);
 			// TODO: Proper support for both taken strings in Amiga version
 			if (_flags.platform == Common::kPlatformAmiga)
@@ -75,7 +75,7 @@ int KyraEngine_LoK::buttonInventoryCallback(Button *caller) {
 		} else {
 			snd_playSoundEffect(0x32);
 			_screen->hideMouse();
-			_screen->drawShape(0, _shapes[216+_itemInHand], _itemPosX[itemOffset], _itemPosY[itemOffset], 0, 0);
+			_screen->drawShape(0, _shapes[216 + _itemInHand], _itemPosX[itemOffset], _itemPosY[itemOffset], 0, 0);
 			_screen->setMouseCursor(1, 1, _shapes[0]);
 			updateSentenceCommand(_itemList[getItemListIndex(_itemInHand)], _placedList[0], 179);
 			_screen->showMouse();
@@ -107,7 +107,7 @@ int KyraEngine_LoK::buttonAmuletCallback(Button *caller) {
 		characterSays(2001, _waitForAmulet[0], 0, -2);
 		return 1;
 	}
-	if (!queryGameFlag(0x55+jewel)) {
+	if (!queryGameFlag(0x55 + jewel)) {
 		assert(_blackJewel);
 		_animator->makeBrandonFaceMouse();
 		drawJewelPress(jewel, 1);
@@ -130,7 +130,7 @@ int KyraEngine_LoK::buttonAmuletCallback(Button *caller) {
 		return 1;
 
 	_unkAmuletVar = 1;
-	switch (jewel-1) {
+	switch (jewel - 1) {
 	case 0:
 		if (_brandonStatusBit & 1) {
 			seq_brandonHealing2();
@@ -198,7 +198,7 @@ GUI_LoK::~GUI_LoK() {
 }
 
 void GUI_LoK::createScreenThumbnail(Graphics::Surface &dst) {
-	uint8 *screen = new uint8[Screen::SCREEN_W*Screen::SCREEN_H];
+	uint8 *screen = new uint8[Screen::SCREEN_W * Screen::SCREEN_H];
 	if (screen) {
 		_screen->queryPageFromDisk("SEENPAGE.TMP", 0, screen);
 		uint8 screenPal[768];
@@ -579,7 +579,7 @@ void GUI_LoK::setupSavegames(Menu &menu, int num) {
 			// Trim long GMM save descriptions to fit our save slots
 			_screen->_charWidth = -2;
 			int fC = _screen->getTextWidth(_savegameNames[i]);
-			while (_savegameNames[i][0] && (fC > 240 )) {
+			while (_savegameNames[i][0] && (fC > 240)) {
 				_savegameNames[i][strlen(_savegameNames[i]) - 1] = 0;
 				fC = _screen->getTextWidth(_savegameNames[i]);
 			}
@@ -605,7 +605,7 @@ int GUI_LoK::saveGameMenu(Button *button) {
 	_screen->savePageToDisk("SEENPAGE.TMP", 0);
 
 	_menu[2].menuNameString = _vm->_guiStrings[8]; // Select a position to save to:
-	_specialSavegameString = _vm->_guiStrings[_vm->gameFlags().platform == Common::kPlatformPC98 ? 10: 9]; // [ EMPTY SLOT ]
+	_specialSavegameString = _vm->_guiStrings[_vm->gameFlags().platform == Common::kPlatformPC98 ? 10 : 9]; // [ EMPTY SLOT ]
 	for (int i = 0; i < 5; i++)
 		_menu[2].item[i].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::saveGame);
 
@@ -710,15 +710,15 @@ void GUI_LoK::updateSavegameString() {
 		Util::convertISOToDOS(inputKey);
 
 		if ((uint8)inputKey > 31 && (uint8)inputKey < (_vm->gameFlags().lang == Common::JA_JPN ? 128 : 226)) {
-			if ((length < ARRAYSIZE(_savegameName)-1) && (width <= 240)) {
+			if ((length < ARRAYSIZE(_savegameName) - 1) && (width <= 240)) {
 				_savegameName[length] = inputKey;
-				_savegameName[length+1] = 0;
+				_savegameName[length + 1] = 0;
 				redrawTextfield();
 			}
 		} else if (_keyPressed.keycode == Common::KEYCODE_BACKSPACE ||
 		           _keyPressed.keycode == Common::KEYCODE_DELETE) {
 			if (length > 0) {
-				_savegameName[length-1] = 0;
+				_savegameName[length - 1] = 0;
 				redrawTextfield();
 			}
 		} else if (_keyPressed.keycode == Common::KEYCODE_RETURN ||
@@ -733,7 +733,7 @@ void GUI_LoK::updateSavegameString() {
 int GUI_LoK::saveGame(Button *button) {
 	g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
 	updateMenuButton(button);
-	_vm->_gameToLoad = _menu[2].item[button->index-0xC].saveSlot;
+	_vm->_gameToLoad = _menu[2].item[button->index - 0xC].saveSlot;
 
 	_screen->loadPageFromDisk("SEENPAGE.TMP", 0);
 	_screen->savePageToDisk("SEENPAGE.TMP", 0);
@@ -800,7 +800,7 @@ int GUI_LoK::savegameConfirm(Button *button) {
 int GUI_LoK::loadGame(Button *button) {
 	updateMenuButton(button);
 	_displaySubMenu = false;
-	_vm->_gameToLoad = _menu[2].item[button->index-0xC].saveSlot;
+	_vm->_gameToLoad = _menu[2].item[button->index - 0xC].saveSlot;
 
 	return 0;
 }
@@ -914,15 +914,15 @@ int GUI_LoK::gameControlsMenu(Button *button) {
 
 void GUI_LoK::setupControls(Menu &menu) {
 	switch (_vm->_configMusic) {
-		case 0:
-			menu.item[0].itemString = _offString; //"Off"
-			break;
-		case 1:
-			menu.item[0].itemString = _onString; //"On"
-			break;
-		case 2:
-			menu.item[0].itemString = _onCDString; //"On + CD"
-			break;
+	case 0:
+		menu.item[0].itemString = _offString; //"Off"
+		break;
+	case 1:
+		menu.item[0].itemString = _onString; //"On"
+		break;
+	case 2:
+		menu.item[0].itemString = _onCDString; //"On + CD"
+		break;
 	}
 
 	if (_vm->_configSounds)
diff --git a/engines/kyra/gui_v1.cpp b/engines/kyra/gui_v1.cpp
index ab44187..f3459dd 100644
--- a/engines/kyra/gui_v1.cpp
+++ b/engines/kyra/gui_v1.cpp
@@ -224,7 +224,7 @@ void GUI_v1::processHighlights(Menu &menu) {
 		y2 = y1 + menu.item[i].height;
 
 		if (mouseX > x1 && mouseX < x2 &&
-			mouseY > y1 && mouseY < y2) {
+		        mouseY > y1 && mouseY < y2) {
 
 			if (menu.highlightedItem != i || _vm->game() == GI_LOL) {
 				if (_vm->game() != GI_LOL) {
@@ -584,15 +584,15 @@ void MainMenu::drawBox(int x, int y, int w, int h, int fill) {
 	--w; --h;
 
 	if (fill)
-		_screen->fillRect(x, y, x+w, y+h, _static.colorTable[0]);
+		_screen->fillRect(x, y, x + w, y + h, _static.colorTable[0]);
 
-	_screen->drawClippedLine(x, y+h, x+w, y+h, _static.colorTable[1]);
-	_screen->drawClippedLine(x+w, y, x+w, y+h, _static.colorTable[1]);
-	_screen->drawClippedLine(x, y, x+w, y, _static.colorTable[2]);
-	_screen->drawClippedLine(x, y, x, y+h, _static.colorTable[2]);
+	_screen->drawClippedLine(x, y + h, x + w, y + h, _static.colorTable[1]);
+	_screen->drawClippedLine(x + w, y, x + w, y + h, _static.colorTable[1]);
+	_screen->drawClippedLine(x, y, x + w, y, _static.colorTable[2]);
+	_screen->drawClippedLine(x, y, x, y + h, _static.colorTable[2]);
 
-	_screen->setPagePixel(_screen->_curPage, x, y+h, _static.colorTable[3]);
-	_screen->setPagePixel(_screen->_curPage, x+w, y, _static.colorTable[3]);
+	_screen->setPagePixel(_screen->_curPage, x, y + h, _static.colorTable[3]);
+	_screen->setPagePixel(_screen->_curPage, x + w, y, _static.colorTable[3]);
 }
 
 void MainMenu::printString(const char *format, int x, int y, int col1, int col2, int flags, ...) {
diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/items_lok.cpp
index 7e41811..2937038 100644
--- a/engines/kyra/items_lok.cpp
+++ b/engines/kyra/items_lok.cpp
@@ -38,7 +38,7 @@ int KyraEngine_LoK::findDuplicateItemShape(int shape) {
 
 	while (dupTable[i] != 0xFF) {
 		if (dupTable[i] == shape)
-			return dupTable[i+1];
+			return dupTable[i + 1];
 		i += 2;
 	}
 	return -1;
@@ -180,7 +180,7 @@ void KyraEngine_LoK::setMouseItem(Item item) {
 	if (item == kItemNone)
 		_screen->setMouseCursor(1, 1, _shapes[6]);
 	else
-		_screen->setMouseCursor(8, 15, _shapes[216+item]);
+		_screen->setMouseCursor(8, 15, _shapes[216 + item]);
 }
 
 void KyraEngine_LoK::wipeDownMouseItem(int xpos, int ypos) {
@@ -196,16 +196,16 @@ void KyraEngine_LoK::wipeDownMouseItem(int xpos, int ypos) {
 
 	while (height >= 0) {
 		restoreItemRect1(xpos, ypos);
-		_screen->setNewShapeHeight(_shapes[216+_itemInHand], height);
+		_screen->setNewShapeHeight(_shapes[216 + _itemInHand], height);
 		uint32 nextTime = _system->getMillis() + 1 * _tickLength;
-		_screen->drawShape(0, _shapes[216+_itemInHand], xpos, y, 0, 0);
+		_screen->drawShape(0, _shapes[216 + _itemInHand], xpos, y, 0, 0);
 		_screen->updateScreen();
 		y += 2;
 		height -= 2;
 		delayUntil(nextTime);
 	}
 	restoreItemRect1(xpos, ypos);
-	_screen->resetShapeHeight(_shapes[216+_itemInHand]);
+	_screen->resetShapeHeight(_shapes[216 + _itemInHand]);
 	removeHandItem();
 	_screen->showMouse();
 }
@@ -517,7 +517,7 @@ void KyraEngine_LoK::itemDropDown(int x, int y, int destX, int destY, byte freeI
 			drawY = tempY - 16;
 			backUpItemRect0(drawX, drawY);
 			uint32 nextTime = _system->getMillis() + 1 * _tickLength;
-			_screen->drawShape(0, _shapes[216+item], drawX, drawY, 0, 0);
+			_screen->drawShape(0, _shapes[216 + item], drawX, drawY, 0, 0);
 			_screen->updateScreen();
 			delayUntil(nextTime);
 		}
@@ -554,7 +554,7 @@ void KyraEngine_LoK::itemDropDown(int x, int y, int destX, int destY, byte freeI
 				drawY = tempY - 16;
 				backUpItemRect0(drawX, drawY);
 				uint32 nextTime = _system->getMillis() + 1 * _tickLength;
-				_screen->drawShape(0, _shapes[216+item], drawX, drawY, 0, 0);
+				_screen->drawShape(0, _shapes[216 + item], drawX, drawY, 0, 0);
 				_screen->updateScreen();
 				delayUntil(nextTime);
 			}
@@ -597,7 +597,7 @@ void KyraEngine_LoK::itemSpecialFX(int x, int y, int item) {
 }
 
 void KyraEngine_LoK::itemSpecialFX1(int x, int y, int item) {
-	uint8 *shape = _shapes[216+item];
+	uint8 *shape = _shapes[216 + item];
 	x -= 8;
 	int startY = y;
 	y -= 15;
@@ -635,7 +635,7 @@ void KyraEngine_LoK::itemSpecialFX2(int x, int y, int item) {
 	for (int i = 204; i >= 201; --i) {
 		restoreItemRect0(x, y);
 		uint32 nextTime = _system->getMillis() + 3 * _tickLength;
-		_screen->drawShape(0, _shapes[216+item], x, y, 0, 0);
+		_screen->drawShape(0, _shapes[216 + item], x, y, 0, 0);
 		_screen->drawShape(0, _shapes[i], x, y + yAdd, 0, 0);
 		_screen->updateScreen();
 		delayUntil(nextTime);
@@ -687,7 +687,7 @@ void KyraEngine_LoK::magicOutMouseItem(int animIndex, int itemPos) {
 	for (int shape = _magicMouseItemStartFrame[animIndex]; shape <= _magicMouseItemEndFrame[animIndex]; ++shape) {
 		restoreItemRect1(x, y);
 		uint32 nextTime = _system->getMillis() + 4 * _tickLength;
-		_screen->drawShape(0, _shapes[216+_itemInHand], x + 4, y + 3, 0, 0);
+		_screen->drawShape(0, _shapes[216 + _itemInHand], x + 4, y + 3, 0, 0);
 		if (tableIndex == -1)
 			_screen->drawShape(0, _shapes[shape], x, y, 0, 0);
 		else
@@ -705,7 +705,7 @@ void KyraEngine_LoK::magicOutMouseItem(int animIndex, int itemPos) {
 	for (int shape = _magicMouseItemStartFrame2[animIndex]; shape <= _magicMouseItemEndFrame2[animIndex]; ++shape) {
 		restoreItemRect1(x, y);
 		uint32 nextTime = _system->getMillis() + 4 * _tickLength;
-		_screen->drawShape(0, _shapes[216+_itemInHand], x + 4, y + 3, 0, 0);
+		_screen->drawShape(0, _shapes[216 + _itemInHand], x + 4, y + 3, 0, 0);
 		if (tableIndex == -1)
 			_screen->drawShape(0, _shapes[shape], x, y, 0, 0);
 		else
@@ -789,12 +789,12 @@ void KyraEngine_LoK::magicInMouseItem(int animIndex, int item, int itemPos) {
 	}
 	restoreItemRect1(x, y);
 	if (itemPos == -1) {
-		_screen->setMouseCursor(8, 15, _shapes[216+item]);
+		_screen->setMouseCursor(8, 15, _shapes[216 + item]);
 		_itemInHand = item;
 	} else {
 		_characterList[0].inventoryItems[itemPos] = item;
 		_screen->hideMouse();
-		_screen->drawShape(0, _shapes[216+item], _itemPosX[itemPos], _itemPosY[itemPos], 0, 0);
+		_screen->drawShape(0, _shapes[216 + item], _itemPosX[itemPos], _itemPosY[itemPos], 0, 0);
 		_screen->showMouse();
 	}
 	_screen->showMouse();
@@ -847,7 +847,7 @@ void KyraEngine_LoK::updatePlayerItemsForScene() {
 		if (_itemInHand > 33)
 			_itemInHand = 33;
 		_screen->hideMouse();
-		_screen->setMouseCursor(8, 15, _shapes[216+_itemInHand]);
+		_screen->setMouseCursor(8, 15, _shapes[216 + _itemInHand]);
 		_screen->showMouse();
 	}
 
@@ -890,7 +890,7 @@ void KyraEngine_LoK::redrawInventory(int page) {
 
 		if (_currentCharacter->inventoryItems[i] != kItemNone) {
 			uint8 item = _currentCharacter->inventoryItems[i];
-			_screen->drawShape(page, _shapes[216+item], _itemPosX[i], _itemPosY[i], 0, 0);
+			_screen->drawShape(page, _shapes[216 + item], _itemPosX[i], _itemPosY[i], 0, 0);
 		}
 	}
 	_screen->showMouse();
@@ -899,23 +899,23 @@ void KyraEngine_LoK::redrawInventory(int page) {
 }
 
 void KyraEngine_LoK::backUpItemRect0(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 3<<3, 24);
-	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 3<<3, 24, _itemBkgBackUp[0]);
+	_screen->rectClip(xpos, ypos, 3 << 3, 24);
+	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 3 << 3, 24, _itemBkgBackUp[0]);
 }
 
 void KyraEngine_LoK::restoreItemRect0(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 3<<3, 24);
-	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 3<<3, 24, _itemBkgBackUp[0]);
+	_screen->rectClip(xpos, ypos, 3 << 3, 24);
+	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 3 << 3, 24, _itemBkgBackUp[0]);
 }
 
 void KyraEngine_LoK::backUpItemRect1(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 4<<3, 32);
-	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 4<<3, 32, _itemBkgBackUp[1]);
+	_screen->rectClip(xpos, ypos, 4 << 3, 32);
+	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 4 << 3, 32, _itemBkgBackUp[1]);
 }
 
 void KyraEngine_LoK::restoreItemRect1(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 4<<3, 32);
-	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 4<<3, 32, _itemBkgBackUp[1]);
+	_screen->rectClip(xpos, ypos, 4 << 3, 32);
+	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 4 << 3, 32, _itemBkgBackUp[1]);
 }
 
 int KyraEngine_LoK::getItemListIndex(Item item) {
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp
index 84990bc..c195f02 100644
--- a/engines/kyra/kyra_lok.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -40,8 +40,8 @@ namespace Kyra {
 KyraEngine_LoK::KyraEngine_LoK(OSystem *system, const GameFlags &flags)
 	: KyraEngine_v1(system, flags) {
 
-	_seq_Forest = _seq_KallakWriting = _seq_KyrandiaLogo = _seq_KallakMalcolm =
-	_seq_MalcolmTree = _seq_WestwoodLogo = _seq_Demo1 = _seq_Demo2 = _seq_Demo3 =
+	_seq_Forest = _seq_KallakWriting = _seq_KyrandiaLogo = _seq_KallakMalcolm = 0;
+	_seq_MalcolmTree = _seq_WestwoodLogo = _seq_Demo1 = _seq_Demo2 = _seq_Demo3 = 0;
 	_seq_Demo4 = 0;
 
 	_seq_WSATable = _seq_CPSTable = _seq_COLTable = _seq_textsTable = 0;
@@ -215,7 +215,7 @@ Common::Error KyraEngine_LoK::init() {
 	_currentCharacter = 0;
 	_characterList = new Character[11];
 	assert(_characterList);
-	memset(_characterList, 0, sizeof(Character)*11);
+	memset(_characterList, 0, sizeof(Character) * 11);
 
 	for (int i = 0; i < 11; ++i)
 		memset(_characterList[i].inventoryItems, 0xFF, sizeof(_characterList[i].inventoryItems));
@@ -370,7 +370,7 @@ void KyraEngine_LoK::startup() {
 	// XXX
 	for (int i = 0; i < 12; ++i) {
 		int size = _screen->getRectSize(3, 24);
-		_shapes[361+i] = new byte[size];
+		_shapes[361 + i] = new byte[size];
 	}
 
 	_itemBkgBackUp[0] = new uint8[_screen->getRectSize(3, 24)];
@@ -582,23 +582,23 @@ void KyraEngine_LoK::setupShapes123(const Shape *shapeTable, int endShape, int f
 
 	uint8 curImage = 0xFF;
 	int curPageBackUp = _screen->_curPage;
-	_screen->_curPage = 8;	// we are using page 8 here in the original page 2 was backuped and then used for this stuff
+	_screen->_curPage = 8;  // we are using page 8 here in the original page 2 was backuped and then used for this stuff
 	int shapeFlags = 2;
 	if (flags)
 		shapeFlags = 3;
-	for (int i = 123; i < 123+endShape; ++i) {
-		uint8 newImage = shapeTable[i-123].imageIndex;
+	for (int i = 123; i < 123 + endShape; ++i) {
+		uint8 newImage = shapeTable[i - 123].imageIndex;
 		if (newImage != curImage && newImage != 0xFF) {
 			assert(_characterImageTable);
 			_screen->loadBitmap(_characterImageTable[newImage], 8, 8, 0);
 			curImage = newImage;
 		}
-		_shapes[i] = _screen->encodeShape(shapeTable[i-123].x<<3, shapeTable[i-123].y, shapeTable[i-123].w<<3, shapeTable[i-123].h, shapeFlags);
-		assert(i-7 < _defaultShapeTableSize);
-		_defaultShapeTable[i-7].xOffset = shapeTable[i-123].xOffset;
-		_defaultShapeTable[i-7].yOffset = shapeTable[i-123].yOffset;
-		_defaultShapeTable[i-7].w = shapeTable[i-123].w;
-		_defaultShapeTable[i-7].h = shapeTable[i-123].h;
+		_shapes[i] = _screen->encodeShape(shapeTable[i - 123].x << 3, shapeTable[i - 123].y, shapeTable[i - 123].w << 3, shapeTable[i - 123].h, shapeFlags);
+		assert(i - 7 < _defaultShapeTableSize);
+		_defaultShapeTable[i - 7].xOffset = shapeTable[i - 123].xOffset;
+		_defaultShapeTable[i - 7].yOffset = shapeTable[i - 123].yOffset;
+		_defaultShapeTable[i - 7].w = shapeTable[i - 123].w;
+		_defaultShapeTable[i - 7].h = shapeTable[i - 123].h;
 	}
 	_screen->_curPage = curPageBackUp;
 }
@@ -788,7 +788,7 @@ void KyraEngine_LoK::updateMousePointer(bool forceUpdate) {
 	}
 
 	if (mouse.x >= _entranceMouseCursorTracks[0] && mouse.y >= _entranceMouseCursorTracks[1]
-		&& mouse.x <= _entranceMouseCursorTracks[2] && mouse.y <= _entranceMouseCursorTracks[3]) {
+	        && mouse.x <= _entranceMouseCursorTracks[2] && mouse.y <= _entranceMouseCursorTracks[3]) {
 		switch (_entranceMouseCursorTracks[4]) {
 		case 0:
 			newMouseState = -6;
@@ -844,7 +844,7 @@ void KyraEngine_LoK::updateMousePointer(bool forceUpdate) {
 				if (_itemInHand == kItemNone)
 					_screen->setMouseCursor(1, 1, _shapes[0]);
 				else
-					_screen->setMouseCursor(8, 15, _shapes[216+_itemInHand]);
+					_screen->setMouseCursor(8, 15, _shapes[216 + _itemInHand]);
 				_screen->showMouse();
 			}
 		}
@@ -884,8 +884,8 @@ int KyraEngine_LoK::checkForNPCScriptRun(int xpos, int ypos) {
 	int charLeft = 0, charRight = 0, charTop = 0, charBottom = 0;
 
 	int scaleFactor = _scaleTable[currentChar->y1];
-	int addX = (((scaleFactor*8)*3)>>8)>>1;
-	int addY = ((scaleFactor*3)<<4)>>8;
+	int addX = (((scaleFactor * 8) * 3) >> 8) >> 1;
+	int addY = ((scaleFactor * 3) << 4) >> 8;
 
 	charLeft = currentChar->x1 - addX;
 	charRight = currentChar->x1 + addX;
@@ -908,7 +908,7 @@ int KyraEngine_LoK::checkForNPCScriptRun(int xpos, int ypos) {
 		charRight = currentChar->x1 + 11;
 		charTop = currentChar->y1 - 48;
 		// if (!i)
-		//	charBottom = currentChar->y2 - 16;
+		//  charBottom = currentChar->y2 - 16;
 		// else
 		charBottom = currentChar->y1;
 
@@ -968,13 +968,13 @@ void KyraEngine_LoK::readSettings() {
 	// The default talk speed is 60. This should be mapped to "Normal".
 
 	if (talkspeed == 0)
-		_configTextspeed = 3;	// Clickable
+		_configTextspeed = 3;   // Clickable
 	if (talkspeed <= 50)
-		_configTextspeed = 0;	// Slow
+		_configTextspeed = 0;   // Slow
 	else if (talkspeed <= 150)
-		_configTextspeed = 1;	// Normal
+		_configTextspeed = 1;   // Normal
 	else
-		_configTextspeed = 2;	// Fast
+		_configTextspeed = 2;   // Fast
 
 	KyraEngine_v1::readSettings();
 }
@@ -983,16 +983,16 @@ void KyraEngine_LoK::writeSettings() {
 	int talkspeed;
 
 	switch (_configTextspeed) {
-	case 0:		// Slow
+	case 0:     // Slow
 		talkspeed = 1;
 		break;
-	case 1:		// Normal
+	case 1:     // Normal
 		talkspeed = 60;
 		break;
-	case 2:		// Fast
+	case 2:     // Fast
 		talkspeed = 255;
 		break;
-	default:	// Clickable
+	default:    // Clickable
 		talkspeed = 0;
 	}
 
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index b818243..e60913c 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -211,7 +211,7 @@ Common::Error KyraEngine_v1::init() {
 }
 
 KyraEngine_v1::~KyraEngine_v1() {
-	for (Common::Array<const Opcode*>::iterator i = _opcodes.begin(); i != _opcodes.end(); ++i)
+	for (Common::Array<const Opcode *>::iterator i = _opcodes.begin(); i != _opcodes.end(); ++i)
 		delete *i;
 	_opcodes.clear();
 	_keyMap.clear();
@@ -262,7 +262,7 @@ int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop, int eventFlag)
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			if (event.kbd.keycode >= Common::KEYCODE_1 && event.kbd.keycode <= Common::KEYCODE_9 &&
-					(event.kbd.hasFlags(Common::KBD_CTRL) || event.kbd.hasFlags(Common::KBD_ALT)) && mainLoop) {
+			        (event.kbd.hasFlags(Common::KBD_CTRL) || event.kbd.hasFlags(Common::KBD_ALT)) && mainLoop) {
 				int saveLoadSlot = 9 - (event.kbd.keycode - Common::KEYCODE_0) + 990;
 
 				if (event.kbd.hasFlags(Common::KBD_CTRL)) {
@@ -440,10 +440,10 @@ void KyraEngine_v1::updateInput() {
 		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			if (event.kbd.keycode == Common::KEYCODE_PERIOD || event.kbd.keycode == Common::KEYCODE_ESCAPE ||
-				event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_RETURN ||
-				event.kbd.keycode == Common::KEYCODE_UP || event.kbd.keycode == Common::KEYCODE_RIGHT ||
-				event.kbd.keycode == Common::KEYCODE_DOWN || event.kbd.keycode == Common::KEYCODE_LEFT)
-					_eventList.push_back(Event(event, true));
+			        event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_RETURN ||
+			        event.kbd.keycode == Common::KEYCODE_UP || event.kbd.keycode == Common::KEYCODE_RIGHT ||
+			        event.kbd.keycode == Common::KEYCODE_DOWN || event.kbd.keycode == Common::KEYCODE_LEFT)
+				_eventList.push_back(Event(event, true));
 			else if (event.kbd.keycode == Common::KEYCODE_q && event.kbd.hasFlags(Common::KBD_CTRL))
 				quitGame();
 			else
@@ -574,11 +574,11 @@ void KyraEngine_v1::readSettings() {
 	bool subtitles = ConfMan.getBool("subtitles");
 
 	if (!speechMute && subtitles)
-		_configVoice = 2;	// Voice & Text
+		_configVoice = 2;   // Voice & Text
 	else if (!speechMute && !subtitles)
-		_configVoice = 1;	// Voice only
+		_configVoice = 1;   // Voice only
 	else
-		_configVoice = 0;	// Text only
+		_configVoice = 0;   // Text only
 
 	setWalkspeed(_configWalkspeed);
 }
@@ -593,15 +593,15 @@ void KyraEngine_v1::writeSettings() {
 	ConfMan.setBool("sfx_mute", _configSounds == 0);
 
 	switch (_configVoice) {
-	case 0:		// Text only
+	case 0:     // Text only
 		speechMute = true;
 		subtitles = true;
 		break;
-	case 1:		// Voice only
+	case 1:     // Voice only
 		speechMute = false;
 		subtitles = false;
 		break;
-	default:	// Voice & Text
+	default:    // Voice & Text
 		speechMute = false;
 		subtitles = true;
 	}
diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp
index e1b7227..adb3063 100644
--- a/engines/kyra/resource.cpp
+++ b/engines/kyra/resource.cpp
@@ -66,7 +66,7 @@ bool Resource::reset() {
 
 		if (!_vm->gameFlags().isDemo && _vm->gameFlags().isTalkie) {
 			// List of files in the talkie version, which can never be unload.
-			static const char * const list[] = {
+			static const char *const list[] = {
 				"ADL.PAK", "CHAPTER1.VRM", "COL.PAK", "FINALE.PAK", "INTRO1.PAK", "INTRO2.PAK",
 				"INTRO3.PAK", "INTRO4.PAK", "MISC.PAK", "SND.PAK", "STARTUP.PAK", "XMI.PAK",
 				"CAVE.APK", "DRAGON1.APK", "DRAGON2.APK", "LAGOON.APK", 0
@@ -122,7 +122,7 @@ bool Resource::reset() {
 			_files.add("installer", loadInstallerArchive("WESTWOOD", "%d", 0), 2, false);
 
 		if (!_vm->gameFlags().isTalkie && !_vm->gameFlags().isDemo) {
-			static const char * const list[] = {
+			static const char *const list[] = {
 				"GENERAL.PAK", 0
 			};
 
@@ -130,7 +130,7 @@ bool Resource::reset() {
 		}
 	} else if (_vm->game() != GI_EOB2) {
 		error("Unknown game id: %d", _vm->game());
-		return false;	// for compilers that don't support NORETURN
+		return false;   // for compilers that don't support NORETURN
 	}
 
 	return true;
@@ -173,7 +173,7 @@ bool Resource::loadFileList(const Common::String &filedata) {
 		f->seek(filenameOffset, SEEK_SET);
 
 		uint8 buffer[13];
-		f->read(buffer, sizeof(buffer)-1);
+		f->read(buffer, sizeof(buffer) - 1);
 		buffer[12] = 0;
 		f->seek(offset + 16, SEEK_SET);
 
@@ -189,7 +189,7 @@ bool Resource::loadFileList(const Common::String &filedata) {
 			} else if (!loadPakFile(filename)) {
 				delete f;
 				error("couldn't load file '%s'", filename.c_str());
-				return false;	// for compilers that don't support NORETURN
+				return false;   // for compilers that don't support NORETURN
 			}
 		}
 	}
@@ -198,21 +198,21 @@ bool Resource::loadFileList(const Common::String &filedata) {
 	return true;
 }
 
-bool Resource::loadFileList(const char * const *filelist, uint32 numFiles) {
+bool Resource::loadFileList(const char *const *filelist, uint32 numFiles) {
 	if (!filelist)
 		return false;
 
 	while (numFiles--) {
 		if (!loadPakFile(filelist[numFiles])) {
 			error("couldn't load file '%s'", filelist[numFiles]);
-			return false;	// for compilers that don't support NORETURN
+			return false;   // for compilers that don't support NORETURN
 		}
 	}
 
 	return true;
 }
 
-bool Resource::loadProtectedFiles(const char * const * list) {
+bool Resource::loadProtectedFiles(const char *const *list) {
 	for (uint i = 0; list[i]; ++i) {
 		Common::ArchiveMemberPtr file = _files.getMember(list[i]);
 		if (!file)
diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp
index af050b1..6f7591c 100644
--- a/engines/kyra/resource_intern.cpp
+++ b/engines/kyra/resource_intern.cpp
@@ -356,7 +356,7 @@ Common::Archive *ResLoaderPak::load(Common::ArchiveMemberPtr memberFile, Common:
 
 		const uint32 magic = stream.readUint32BE();
 
-		if (magic != MKTAG('S','C','V','M'))
+		if (magic != MKTAG('S', 'C', 'V', 'M'))
 			error("LINKLIST file does not contain 'SCVM' header");
 
 		const uint32 links = stream.readUint32BE();
@@ -391,10 +391,10 @@ bool ResLoaderInsMalcolm::isLoadable(const Common::String &filename, Common::See
 	stream.seek(3, SEEK_SET);
 	int32 size = stream.readUint32LE();
 
-	if (size+7 > stream.size())
+	if (size + 7 > stream.size())
 		return false;
 
-	stream.seek(size+5, SEEK_SET);
+	stream.seek(size + 5, SEEK_SET);
 	uint8 buffer[2];
 	stream.read(&buffer, 2);
 
@@ -700,7 +700,7 @@ bool FileExpander::process(uint8 *dst, const uint8 *src, uint32 outsize, uint32
 			_src->copyBytes(d);
 			postprocess = false;
 			needrefresh = true;
-		} else if (mode == 0){
+		} else if (mode == 0) {
 			uint8 *d2 = _tables[0];
 			memset(d2, 8, 144);
 			memset(d2 + 144, 9, 112);
@@ -844,7 +844,7 @@ void FileExpander::generateTables(uint8 srcIndex, uint8 dstIndex, uint8 dstIndex
 	cnt--;
 	s = tbl1 + cnt;
 	d = &_tables16[2][cnt];
-	uint16 * bt = (uint16 *)tbl3;
+	uint16 *bt = (uint16 *)tbl3;
 	uint16 inc = 0;
 	uint16 cnt2 = 0;
 
diff --git a/engines/kyra/saveload_lok.cpp b/engines/kyra/saveload_lok.cpp
index 22d412e..b76d1da 100644
--- a/engines/kyra/saveload_lok.cpp
+++ b/engines/kyra/saveload_lok.cpp
@@ -163,7 +163,7 @@ Common::Error KyraEngine_LoK::loadGameState(int slot) {
 		if (!queryGameFlag(0xF1)) {
 			for (int i = 0x55; i <= 0x5A; ++i) {
 				if (queryGameFlag(i))
-					seq_createAmuletJewel(i-0x55, 10, 1, 1);
+					seq_createAmuletJewel(i - 0x55, 10, 1, 1);
 			}
 		}
 
diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/scene_lok.cpp
index ab1670e..ea09091 100644
--- a/engines/kyra/scene_lok.cpp
+++ b/engines/kyra/scene_lok.cpp
@@ -158,7 +158,7 @@ void KyraEngine_LoK::enterNewScene(int sceneId, int facing, int unk1, int unk2,
 	_walkBlockWest = currentRoom->westExit;
 
 	if (_walkBlockNorth == 0xFFFF)
-		_screen->blockOutRegion(0, 0, 320, (_northExitHeight & 0xFF)+3);
+		_screen->blockOutRegion(0, 0, 320, (_northExitHeight & 0xFF) + 3);
 	if (_walkBlockEast == 0xFFFF)
 		_screen->blockOutRegion(312, 0, 8, 139);
 	if (_walkBlockSouth == 0xFFFF)
@@ -348,22 +348,22 @@ void KyraEngine_LoK::setCharacterPositionHelper(int character, int *facingTable)
 	};
 
 	if (facing == 0) {
-		if (maxAnimationFrame[36+character] > ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[36+character];
-		if (maxAnimationFrame[30+character] < ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[36+character];
+		if (maxAnimationFrame[36 + character] > ch->currentAnimFrame)
+			ch->currentAnimFrame = maxAnimationFrame[36 + character];
+		if (maxAnimationFrame[30 + character] < ch->currentAnimFrame)
+			ch->currentAnimFrame = maxAnimationFrame[36 + character];
 	} else if (facing == 4) {
-		if (maxAnimationFrame[18+character] > ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[18+character];
-		if (maxAnimationFrame[12+character] < ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[18+character];
+		if (maxAnimationFrame[18 + character] > ch->currentAnimFrame)
+			ch->currentAnimFrame = maxAnimationFrame[18 + character];
+		if (maxAnimationFrame[12 + character] < ch->currentAnimFrame)
+			ch->currentAnimFrame = maxAnimationFrame[18 + character];
 	} else {
-		if (maxAnimationFrame[18+character] < ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[30+character];
+		if (maxAnimationFrame[18 + character] < ch->currentAnimFrame)
+			ch->currentAnimFrame = maxAnimationFrame[30 + character];
 		if (maxAnimationFrame[character] == ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[6+character];
+			ch->currentAnimFrame = maxAnimationFrame[6 + character];
 		if (maxAnimationFrame[character] < ch->currentAnimFrame)
-			ch->currentAnimFrame = maxAnimationFrame[6+character]+2;
+			ch->currentAnimFrame = maxAnimationFrame[6 + character] + 2;
 	}
 
 	if (character == 0 && (_brandonStatusBit & 0x10))
@@ -596,7 +596,7 @@ void KyraEngine_LoK::initSceneObjectList(int brandonAlive) {
 	curAnimState->drawY = _currentCharacter->y1;
 	curAnimState->sceneAnimPtr = _shapes[_currentCharacter->currentAnimFrame];
 	curAnimState->animFrameNumber = _currentCharacter->currentAnimFrame;
-	startAnimFrame = _currentCharacter->currentAnimFrame-7;
+	startAnimFrame = _currentCharacter->currentAnimFrame - 7;
 	int xOffset = _defaultShapeTable[startAnimFrame].xOffset;
 	int yOffset = _defaultShapeTable[startAnimFrame].yOffset;
 
@@ -638,7 +638,7 @@ void KyraEngine_LoK::initSceneObjectList(int brandonAlive) {
 		curAnimState->drawY = ch->y1;
 		curAnimState->sceneAnimPtr = _shapes[ch->currentAnimFrame];
 		curAnimState->animFrameNumber = ch->currentAnimFrame;
-		startAnimFrame = ch->currentAnimFrame-7;
+		startAnimFrame = ch->currentAnimFrame - 7;
 		xOffset = _defaultShapeTable[startAnimFrame].xOffset;
 		yOffset = _defaultShapeTable[startAnimFrame].yOffset;
 		if (_scaleMode) {
@@ -714,7 +714,7 @@ void KyraEngine_LoK::initSceneObjectList(int brandonAlive) {
 		byte curItem = curRoom->itemsTable[i];
 		if (curItem != 0xFF) {
 			curAnimState->drawY = curRoom->itemsYPos[i];
-			curAnimState->sceneAnimPtr = _shapes[216+curItem];
+			curAnimState->sceneAnimPtr = _shapes[216 + curItem];
 			curAnimState->animFrameNumber = (int16)0xFFFF;
 			curAnimState->y1 = curRoom->itemsYPos[i];
 			curAnimState->x1 = curRoom->itemsXPos[i];
@@ -780,10 +780,10 @@ void KyraEngine_LoK::initSceneScreen(int brandonAlive) {
 	} else {
 		if (_unkScreenVar1 && !queryGameFlag(0xA0)) {
 			for (int i = 0; i < 60; ++i) {
-				uint16 col = _screen->getPalette(0)[684+i];
-				col += _screen->getPalette(1)[684+i] << 1;
+				uint16 col = _screen->getPalette(0)[684 + i];
+				col += _screen->getPalette(1)[684 + i] << 1;
 				col >>= 2;
-				_screen->getPalette(0)[684+i] = col;
+				_screen->getPalette(0)[684 + i] = col;
 			}
 			_screen->setScreenPalette(_screen->getPalette(0));
 		}
@@ -847,7 +847,7 @@ int KyraEngine_LoK::handleSceneChange(int xpos, int ypos, int unk1, int frameRes
 		}
 	}
 
-	if (ypos <= (_northExitHeight&0xFF)+2) {
+	if (ypos <= (_northExitHeight & 0xFF) + 2) {
 		if (_roomTable[sceneId].northExit != 0xFFFF) {
 			xpos = _sceneExits.northXPos;
 			ypos = _northExitHeight & 0xFF;
@@ -1093,7 +1093,7 @@ void KyraEngine_LoK::setCharactersInDefaultScene() {
 		Character *cur = &_characterList[i];
 		//cur->field_20 = 0;
 
-		const uint32 *curTable = defaultSceneTable[i-1];
+		const uint32 *curTable = defaultSceneTable[i - 1];
 		cur->sceneId = curTable[0];
 
 		if (cur->sceneId == _currentCharacter->sceneId)
diff --git a/engines/kyra/scene_v1.cpp b/engines/kyra/scene_v1.cpp
index bc90f49..3679897 100644
--- a/engines/kyra/scene_v1.cpp
+++ b/engines/kyra/scene_v1.cpp
@@ -115,7 +115,7 @@ int KyraEngine_v1::findWay(int x, int y, int toX, int toY, int *moveTable, int m
 				delete[] pathTable2;
 				return 0x7D00;
 			}
-			memcpy(&moveTable[lastUsedEntry], pathTable1, temp*sizeof(int));
+			memcpy(&moveTable[lastUsedEntry], pathTable1, temp * sizeof(int));
 			lastUsedEntry += temp;
 		} else {
 			if (lastUsedEntry + tempValue > moveTableSize) {
@@ -123,7 +123,7 @@ int KyraEngine_v1::findWay(int x, int y, int toX, int toY, int *moveTable, int m
 				delete[] pathTable2;
 				return 0x7D00;
 			}
-			memcpy(&moveTable[lastUsedEntry], pathTable2, tempValue*sizeof(int));
+			memcpy(&moveTable[lastUsedEntry], pathTable2, tempValue * sizeof(int));
 			lastUsedEntry += tempValue;
 		}
 		x = curX;
@@ -161,16 +161,16 @@ int KyraEngine_v1::findSubPath(int x, int y, int toX, int toY, int *moveTable, i
 	while (position != end) {
 		int newFacing2 = newFacing;
 		while (true) {
-			changePosTowardsFacing(xpos1, ypos1, facingTable1[start*8 + newFacing2]);
+			changePosTowardsFacing(xpos1, ypos1, facingTable1[start * 8 + newFacing2]);
 			if (!lineIsPassable(xpos1, ypos1)) {
-				if (facingTable1[start*8 + newFacing2] == newFacing)
+				if (facingTable1[start * 8 + newFacing2] == newFacing)
 					return 0x7D00;
-				newFacing2 = facingTable1[start*8 + newFacing2];
+				newFacing2 = facingTable1[start * 8 + newFacing2];
 				xpos1 = x;
 				ypos1 = y;
 				continue;
 			}
-			newFacing = facingTable1[start*8 + newFacing2];
+			newFacing = facingTable1[start * 8 + newFacing2];
 			break;
 		}
 		// debug drawing
@@ -200,7 +200,7 @@ int KyraEngine_v1::findSubPath(int x, int y, int toX, int toY, int *moveTable, i
 		if (xpos1 == xpos2 && ypos1 == ypos2)
 			break;
 
-		newFacing = facingTable3[start*8 + newFacing];
+		newFacing = facingTable3[start * 8 + newFacing];
 	}
 
 	return 0x7D00;
diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp
index 447e142..f32a898 100644
--- a/engines/kyra/screen_lok.cpp
+++ b/engines/kyra/screen_lok.cpp
@@ -80,7 +80,7 @@ void Screen_LoK::fadeSpecialPalette(int palIndex, int startIndex, int size, int
 	tempPal.copy(getPalette(0));
 	tempPal.copy(_vm->palTable1()[palIndex], 0, size, startIndex);
 
-	fadePalette(tempPal, fadeTime*18);
+	fadePalette(tempPal, fadeTime * 18);
 
 	getPalette(0).copy(tempPal, startIndex, size);
 	setScreenPalette(getPalette(0));
@@ -108,16 +108,16 @@ void Screen_LoK::bitBlitRects() {
 }
 
 void Screen_LoK::savePageToDisk(const char *file, int page) {
-	if (!_saveLoadPage[page/2]) {
-		_saveLoadPage[page/2] = new uint8[SCREEN_W * SCREEN_H];
-		assert(_saveLoadPage[page/2]);
+	if (!_saveLoadPage[page / 2]) {
+		_saveLoadPage[page / 2] = new uint8[SCREEN_W * SCREEN_H];
+		assert(_saveLoadPage[page / 2]);
 	}
-	memcpy(_saveLoadPage[page/2], getPagePtr(page), SCREEN_W * SCREEN_H);
+	memcpy(_saveLoadPage[page / 2], getPagePtr(page), SCREEN_W * SCREEN_H);
 
 	if (_useOverlays) {
-		if (!_saveLoadPageOvl[page/2]) {
-			_saveLoadPageOvl[page/2] = new uint8[SCREEN_OVL_SJIS_SIZE];
-			assert(_saveLoadPageOvl[page/2]);
+		if (!_saveLoadPageOvl[page / 2]) {
+			_saveLoadPageOvl[page / 2] = new uint8[SCREEN_OVL_SJIS_SIZE];
+			assert(_saveLoadPageOvl[page / 2]);
 		}
 
 		uint8 *srcPage = getOverlayPtr(page);
@@ -126,49 +126,49 @@ void Screen_LoK::savePageToDisk(const char *file, int page) {
 			return;
 		}
 
-		memcpy(_saveLoadPageOvl[page/2], srcPage, SCREEN_OVL_SJIS_SIZE);
+		memcpy(_saveLoadPageOvl[page / 2], srcPage, SCREEN_OVL_SJIS_SIZE);
 	}
 }
 
 void Screen_LoK::loadPageFromDisk(const char *file, int page) {
-	if (!_saveLoadPage[page/2]) {
+	if (!_saveLoadPage[page / 2]) {
 		warning("trying to restore page %d, but no backup found", page);
 		return;
 	}
 
-	copyBlockToPage(page, 0, 0, SCREEN_W, SCREEN_H, _saveLoadPage[page/2]);
-	delete[] _saveLoadPage[page/2];
-	_saveLoadPage[page/2] = 0;
+	copyBlockToPage(page, 0, 0, SCREEN_W, SCREEN_H, _saveLoadPage[page / 2]);
+	delete[] _saveLoadPage[page / 2];
+	_saveLoadPage[page / 2] = 0;
 
-	if (_saveLoadPageOvl[page/2]) {
+	if (_saveLoadPageOvl[page / 2]) {
 		uint8 *dstPage = getOverlayPtr(page);
 		if (!dstPage) {
 			warning("trying to restore unsupported overlay page %d", page);
 			return;
 		}
 
-		memcpy(dstPage, _saveLoadPageOvl[page/2], SCREEN_OVL_SJIS_SIZE);
-		delete[] _saveLoadPageOvl[page/2];
-		_saveLoadPageOvl[page/2] = 0;
+		memcpy(dstPage, _saveLoadPageOvl[page / 2], SCREEN_OVL_SJIS_SIZE);
+		delete[] _saveLoadPageOvl[page / 2];
+		_saveLoadPageOvl[page / 2] = 0;
 	}
 }
 
 void Screen_LoK::queryPageFromDisk(const char *file, int page, uint8 *buffer) {
-	if (!_saveLoadPage[page/2]) {
+	if (!_saveLoadPage[page / 2]) {
 		warning("trying to query page %d, but no backup found", page);
 		return;
 	}
 
-	memcpy(buffer, _saveLoadPage[page/2], SCREEN_W*SCREEN_H);
+	memcpy(buffer, _saveLoadPage[page / 2], SCREEN_W * SCREEN_H);
 }
 
 void Screen_LoK::deletePageFromDisk(int page) {
-	delete[] _saveLoadPage[page/2];
-	_saveLoadPage[page/2] = 0;
+	delete[] _saveLoadPage[page / 2];
+	_saveLoadPage[page / 2] = 0;
 
-	if (_saveLoadPageOvl[page/2]) {
-		delete[] _saveLoadPageOvl[page/2];
-		_saveLoadPageOvl[page/2] = 0;
+	if (_saveLoadPageOvl[page / 2]) {
+		delete[] _saveLoadPageOvl[page / 2];
+		_saveLoadPageOvl[page / 2] = 0;
 	}
 }
 
@@ -194,16 +194,16 @@ void Screen_LoK::copyBackgroundBlock(int x, int page, int flag) {
 	copyRegionToBuffer(_curPage, 8, 8, 8, height, ptr2);
 	for (int i = 0; i < 19; ++i) {
 		int tempX = curX + 1;
-		copyRegionToBuffer(_curPage, tempX<<3, 8, 8, height, ptr1);
-		copyBlockToPage(_curPage, tempX<<3, 8, 8, height, ptr2);
+		copyRegionToBuffer(_curPage, tempX << 3, 8, 8, height, ptr1);
+		copyBlockToPage(_curPage, tempX << 3, 8, 8, height, ptr2);
 		int newXPos = curX + x;
 		if (newXPos > 37)
 			newXPos = newXPos % 38;
 
 		tempX = newXPos + 1;
-		copyRegionToBuffer(_curPage, tempX<<3, 8, 8, height, ptr2);
-		copyBlockToPage(_curPage, tempX<<3, 8, 8, height, ptr1);
-		curX += x*2;
+		copyRegionToBuffer(_curPage, tempX << 3, 8, 8, height, ptr2);
+		copyBlockToPage(_curPage, tempX << 3, 8, 8, height, ptr1);
+		curX += x * 2;
 		if (curX > 37) {
 			curX = curX % 38;
 		}
@@ -231,7 +231,7 @@ int Screen_LoK::getRectSize(int x, int y) {
 	else if (y > 200)
 		y = 200;
 
-	return ((x*y) << 3);
+	return ((x * y) << 3);
 }
 
 void Screen_LoK::postProcessCursor(uint8 *data, int width, int height, int pitch) {
@@ -332,7 +332,7 @@ void Screen_LoK_16::getFadeParams(const Palette &pal, int delay, int &delayInc,
 
 int Screen_LoK_16::fadePalStep(const Palette &pal, int diff) {
 	error("Screen_LoK_16::fadePalStep called");
-	return 0;	// for compilers that don't support NORETURN
+	return 0;   // for compilers that don't support NORETURN
 }
 
 void Screen_LoK_16::paletteMap(uint8 idx, int r, int g, int b) {
diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp
index ae6fb4b..135925a 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);
diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp
index 4cfbdf8..aaa07e6 100644
--- a/engines/kyra/script_v1.cpp
+++ b/engines/kyra/script_v1.cpp
@@ -106,13 +106,13 @@ int KyraEngine_v1::o1_fillRect(EMCState *script) {
 
 int KyraEngine_v1::o1_blockInWalkableRegion(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_blockInWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
-	screen()->blockInRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
+	screen()->blockInRegion(stackPos(0), stackPos(1), stackPos(2) - stackPos(0) + 1, stackPos(3) - stackPos(1) + 1);
 	return 0;
 }
 
 int KyraEngine_v1::o1_blockOutWalkableRegion(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_blockOutWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
-	screen()->blockOutRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
+	screen()->blockOutRegion(stackPos(0), stackPos(1), stackPos(2) - stackPos(0) + 1, stackPos(3) - stackPos(1) + 1);
 	return 0;
 }
 
diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp
index 1bdcde5..1f9097d 100644
--- a/engines/kyra/seqplayer.cpp
+++ b/engines/kyra/seqplayer.cpp
@@ -375,15 +375,14 @@ void SeqPlayer::s1_copyRegionSpecial() {
 		_screen->copyRegion(152, 56, 152, 56, 48, 48, 2, 0);
 		break;
 	case 4: {
-			_screen->_charWidth = -2;
-			const int x = (Screen::SCREEN_W - _screen->getTextWidth(copyStr)) / 2;
-			const int y = 179;
-			_screen->setTextColorMap(colorMap);
-			if (_vm->gameFlags().platform != Common::kPlatformAmiga)
-				_screen->printText(copyStr, x + 1, y + 1, 0xB, 0xC);
-			_screen->printText(copyStr, x, y, 0xF, 0xC);
-		}
-		break;
+		_screen->_charWidth = -2;
+		const int x = (Screen::SCREEN_W - _screen->getTextWidth(copyStr)) / 2;
+		const int y = 179;
+		_screen->setTextColorMap(colorMap);
+		if (_vm->gameFlags().platform != Common::kPlatformAmiga)
+			_screen->printText(copyStr, x + 1, y + 1, 0xB, 0xC);
+		_screen->printText(copyStr, x, y, 0xF, 0xC);
+		} break;
 	case 5:
 		_screen->_curPage = 2;
 		break;
diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp
index 99ae2ad..3475402 100644
--- a/engines/kyra/sequences_lok.cpp
+++ b/engines/kyra/sequences_lok.cpp
@@ -381,10 +381,10 @@ void KyraEngine_LoK::seq_createAmuletJewel(int jewel, int page, int noSound, int
 			}
 		}
 	}
-	_screen->drawShape(page, _shapes[323+jewel], _amuletX2[jewel], _amuletY2[jewel], 0, 0);
+	_screen->drawShape(page, _shapes[323 + jewel], _amuletX2[jewel], _amuletY2[jewel], 0, 0);
 	_screen->updateScreen();
 	_screen->showMouse();
-	setGameFlag(0x55+jewel);
+	setGameFlag(0x55 + jewel);
 }
 
 void KyraEngine_LoK::seq_brandonHealing() {
@@ -764,7 +764,7 @@ void KyraEngine_LoK::seq_makeBrandonWisp() {
 
 	if (_flags.platform == Common::kPlatformAmiga) {
 		if ((_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245) ||
-			(_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186))
+		        (_currentCharacter->sceneId >= 118 && _currentCharacter->sceneId <= 186))
 			_screen->fadePalette(_screen->getPalette(10), 0x54);
 	} else {
 		if (_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245)
@@ -1730,7 +1730,7 @@ int KyraEngine_LoK::handleBeadState() {
 			if (_system->getMillis() > _beadStateTimer2 && _malcolmFlag == 7 && !_unkAmuletVar && !_text->printed()) {
 				snd_playSoundEffect(0x0B);
 				if (_currentCharacter->x1 > 233 && _currentCharacter->x1 < 305 && _currentCharacter->y1 > 85 && _currentCharacter->y1 < 105 &&
-					(_brandonStatusBit & 0x20)) {
+				        (_brandonStatusBit & 0x20)) {
 					_beadState1.unk8 = 290;
 					_beadState1.unk9 = 40;
 					_beadStateVar = 5;
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index cd49b03..e2a86d7 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -288,7 +288,7 @@ void StaticResource::deinit() {
 	unloadId(-1);
 }
 
-const char * const *StaticResource::loadStrings(int id, int &strings) {
+const char *const *StaticResource::loadStrings(int id, int &strings) {
 	return (const char * const *)getData(id, kStringList, strings);
 }
 
@@ -438,7 +438,7 @@ bool StaticResource::loadStringTable(Common::SeekableReadStream &stream, void *&
 		while ((c = (char)stream.readByte()) != 0)
 			string += c;
 
-		output[i] = new char[string.size()+1];
+		output[i] = new char[string.size() + 1];
 		strcpy(output[i], string.c_str());
 	}
 
@@ -502,10 +502,10 @@ bool StaticResource::loadRoomTable(Common::SeekableReadStream &stream, void *&pt
 		loadTo[i].eastExit = stream.readUint16BE();
 		loadTo[i].southExit = stream.readUint16BE();
 		loadTo[i].westExit = stream.readUint16BE();
-		memset(&loadTo[i].itemsTable[0], 0xFF, sizeof(byte)*6);
-		memset(&loadTo[i].itemsTable[6], 0, sizeof(byte)*6);
-		memset(loadTo[i].itemsXPos, 0, sizeof(uint16)*12);
-		memset(loadTo[i].itemsYPos, 0, sizeof(uint8)*12);
+		memset(&loadTo[i].itemsTable[0], 0xFF, sizeof(byte) * 6);
+		memset(&loadTo[i].itemsTable[6], 0, sizeof(byte) * 6);
+		memset(loadTo[i].itemsXPos, 0, sizeof(uint16) * 12);
+		memset(loadTo[i].itemsYPos, 0, sizeof(uint8) * 12);
 		memset(loadTo[i].needInit, 0, sizeof(loadTo[i].needInit));
 	}
 
@@ -526,9 +526,9 @@ bool StaticResource::loadHofSequenceData(Common::SeekableReadStream &stream, voi
 
 		tmp_s[i].flags = stream.readUint16BE();
 		tmp_s[i].wsaFile = new char[14];
-		stream.read(const_cast<char*>(tmp_s[i].wsaFile), 14);
+		stream.read(const_cast<char *>(tmp_s[i].wsaFile), 14);
 		tmp_s[i].cpsFile = new char[14];
-		stream.read(const_cast<char*>(tmp_s[i].cpsFile), 14);
+		stream.read(const_cast<char *>(tmp_s[i].cpsFile), 14);
 		tmp_s[i].startupCommand = stream.readByte();
 		tmp_s[i].finalCommand = stream.readByte();
 		tmp_s[i].stringIndex1 = stream.readUint16BE();
@@ -552,7 +552,7 @@ bool StaticResource::loadHofSequenceData(Common::SeekableReadStream &stream, voi
 
 		tmp_n[i].flags = stream.readUint16BE();
 		tmp_n[i].wsaFile = new char[14];
-		stream.read(const_cast<char*>(tmp_n[i].wsaFile), 14);
+		stream.read(const_cast<char *>(tmp_n[i].wsaFile), 14);
 		tmp_n[i].startframe = stream.readUint16BE();
 		tmp_n[i].endFrame = stream.readUint16BE();
 		tmp_n[i].frameDelay = stream.readUint16BE();
@@ -691,7 +691,7 @@ void StaticResource::freeHofSequenceData(void *&ptr, int &size) {
 }
 
 void StaticResource::freeHofShapeAnimDataV1(void *&ptr, int &size) {
-	ItemAnimData_v1 *d= (ItemAnimData_v1 *)ptr;
+	ItemAnimData_v1 *d = (ItemAnimData_v1 *)ptr;
 	for (int i = 0; i < size; i++)
 		delete[] d[i].frames;
 	delete[] d;
@@ -700,7 +700,7 @@ void StaticResource::freeHofShapeAnimDataV1(void *&ptr, int &size) {
 }
 
 void StaticResource::freeHofShapeAnimDataV2(void *&ptr, int &size) {
-	ItemAnimData_v2 *d= (ItemAnimData_v2 *)ptr;
+	ItemAnimData_v2 *d = (ItemAnimData_v2 *)ptr;
 	for (int i = 0; i < size; i++)
 		delete[] d[i].frames;
 	delete[] d;
@@ -800,7 +800,7 @@ void KyraEngine_LoK::initStaticResource() {
 		_roomTable = new Room[_roomTableSize];
 		assert(_roomTable);
 
-		memcpy(_roomTable, tempRoomList, _roomTableSize*sizeof(Room));
+		memcpy(_roomTable, tempRoomList, _roomTableSize * sizeof(Room));
 		tempRoomList = 0;
 
 		_staticres->unloadId(k1RoomList);
@@ -813,7 +813,7 @@ void KyraEngine_LoK::initStaticResource() {
 		_defaultShapeTable = new Shape[_defaultShapeTableSize];
 		assert(_defaultShapeTable);
 
-		memcpy(_defaultShapeTable, tempShapeTable, _defaultShapeTableSize*sizeof(Shape));
+		memcpy(_defaultShapeTable, tempShapeTable, _defaultShapeTableSize * sizeof(Shape));
 		tempShapeTable = 0;
 
 		_staticres->unloadId(k1DefaultShapes);
@@ -874,7 +874,7 @@ void KyraEngine_LoK::loadCharacterShapes() {
 		assert(i < _defaultShapeTableSize);
 		Shape *shape = &_defaultShapeTable[i];
 		if (shape->imageIndex == 0xFF) {
-			_shapes[i+7] = 0;
+			_shapes[i + 7] = 0;
 			continue;
 		}
 		if (shape->imageIndex != curImage) {
@@ -882,7 +882,7 @@ void KyraEngine_LoK::loadCharacterShapes() {
 			_screen->loadBitmap(_characterImageTable[shape->imageIndex], 3, 3, 0);
 			curImage = shape->imageIndex;
 		}
-		_shapes[i+7] = _screen->encodeShape(shape->x<<3, shape->y, shape->w<<3, shape->h, 1);
+		_shapes[i + 7] = _screen->encodeShape(shape->x << 3, shape->y, shape->w << 3, shape->h, 1);
 	}
 	_screen->_curPage = videoPage;
 }
@@ -893,16 +893,16 @@ void KyraEngine_LoK::loadSpecialEffectShapes() {
 
 	int currShape;
 	for (currShape = 173; currShape < 183; currShape++)
-		_shapes[currShape] = _screen->encodeShape((currShape-173) * 24, 0, 24, 24, 1);
+		_shapes[currShape] = _screen->encodeShape((currShape - 173) * 24, 0, 24, 24, 1);
 
 	for (currShape = 183; currShape < 190; currShape++)
-		_shapes[currShape] = _screen->encodeShape((currShape-183) * 24, 24, 24, 24, 1);
+		_shapes[currShape] = _screen->encodeShape((currShape - 183) * 24, 24, 24, 24, 1);
 
 	for (currShape = 190; currShape < 201; currShape++)
-		_shapes[currShape] = _screen->encodeShape((currShape-190) * 24, 48, 24, 24, 1);
+		_shapes[currShape] = _screen->encodeShape((currShape - 190) * 24, 48, 24, 24, 1);
 
 	for (currShape = 201; currShape < 206; currShape++)
-		_shapes[currShape] = _screen->encodeShape((currShape-201) * 16, 106, 16, 16, 1);
+		_shapes[currShape] = _screen->encodeShape((currShape - 201) * 16, 106, 16, 16, 1);
 }
 
 void KyraEngine_LoK::loadItems() {
@@ -917,22 +917,22 @@ void KyraEngine_LoK::loadItems() {
 		_shapes[323 + shape] = _screen->encodeShape((shape - 1) * 32, 0, 32, 17, 0);
 
 	for (shape = 330; shape <= 334; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-330) * 32, 102, 32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 330) * 32, 102, 32, 17, 0);
 
 	for (shape = 335; shape <= 339; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-335) * 32, 17,  32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 335) * 32, 17,  32, 17, 0);
 
 	for (shape = 340; shape <= 344; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-340) * 32, 34,  32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 340) * 32, 34,  32, 17, 0);
 
 	for (shape = 345; shape <= 349; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-345) * 32, 51,  32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 345) * 32, 51,  32, 17, 0);
 
 	for (shape = 350; shape <= 354; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-350) * 32, 68,  32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 350) * 32, 68,  32, 17, 0);
 
 	for (shape = 355; shape <= 359; shape++)
-		_shapes[shape] = _screen->encodeShape((shape-355) * 32, 85,  32, 17, 0);
+		_shapes[shape] = _screen->encodeShape((shape - 355) * 32, 85,  32, 17, 0);
 
 
 	_screen->loadBitmap("ITEMS.CPS", 3, 3, 0);
@@ -944,7 +944,7 @@ void KyraEngine_LoK::loadItems() {
 		if (shape != -1)
 			_shapes[216 + i] = _shapes[216 + shape];
 		else
-			_shapes[216 + i] = _screen->encodeShape( (i % 20) * 16, i/20 * 16, 16, 16, 0);
+			_shapes[216 + i] = _screen->encodeShape((i % 20) * 16, i / 20 * 16, 16, 16, 0);
 	}
 
 	_res->loadFileToBuf("_ITEM_HT.DAT", &_itemHtDat, sizeof(_itemHtDat));
@@ -1023,7 +1023,7 @@ void KyraEngine_HoF::initStaticResource() {
 		if (tlkfiles && len > 1) {
 			for (int ii = 0; ii < tmpSize; ii++) {
 				if (strlen(tlkfiles[ii]) > 1 && !scumm_stricmp(&seqSoundList[i][1], &tlkfiles[ii][1]))
-						strcpy(tmpSndLst[i], tlkfiles[ii]);
+					strcpy(tmpSndLst[i], tlkfiles[ii]);
 			}
 		}
 
@@ -1078,8 +1078,8 @@ void KyraEngine_HoF::initStaticResource() {
 	// setup sequence data
 	_sequences = _staticres->loadHofSequenceData(k2SeqplaySeqData, tmpSize);
 
-	static const SeqProc hofSequenceCallbacks[] = { 0,
-		&KyraEngine_HoF::seq_introWestwood,
+	static const SeqProc hofSequenceCallbacks[] = {
+		0, &KyraEngine_HoF::seq_introWestwood,
 		&KyraEngine_HoF::seq_introTitle, &KyraEngine_HoF::seq_introOverview,
 		&KyraEngine_HoF::seq_introLibrary, &KyraEngine_HoF::seq_introHand,
 		&KyraEngine_HoF::seq_introPoint, &KyraEngine_HoF::seq_introZanfaun,
@@ -1125,14 +1125,15 @@ void KyraEngine_HoF::initStaticResource() {
 
 	_callbackS =
 #ifdef ENABLE_LOL
-		_flags.gameID == GI_LOL ? kLoLDemoSequenceCallbacks :
+	    _flags.gameID == GI_LOL ? kLoLDemoSequenceCallbacks :
 #endif // ENABLE_LOL
-		((_flags.isDemo && !_flags.isTalkie) ? hofDemoSequenceCallbacks : hofSequenceCallbacks);
+	    ((_flags.isDemo && !_flags.isTalkie) ? hofDemoSequenceCallbacks : hofSequenceCallbacks);
+
 	_callbackN =
 #ifdef ENABLE_LOL
-		_flags.gameID == GI_LOL ? kLoLDemoNestedSequenceCallbacks :
+	    _flags.gameID == GI_LOL ? kLoLDemoNestedSequenceCallbacks :
 #endif // ENABLE_LOL
-		((_flags.isDemo && !_flags.isTalkie) ? hofDemoNestedSequenceCallbacks : hofNestedSequenceCallbacks);
+	    ((_flags.isDemo && !_flags.isTalkie) ? hofDemoNestedSequenceCallbacks : hofNestedSequenceCallbacks);
 }
 
 void KyraEngine_MR::initStaticResource() {
@@ -1184,7 +1185,7 @@ const ScreenDim Screen_HoF::_screenDimTable[] = {
 	{ 0x00, 0x00, 0x28, 0x88, 0xC7, 0xCF, 0x00, 0x00 },
 	{ 0x00, 0x08, 0x28, 0xB8, 0xC7, 0xCF, 0x00, 0x00 },
 	{ 0x01, 0x28, 0x26, 0x46, 0xC7, 0xCC, 0x00, 0x00 },
-	{ 0x0A, 0x96, 0x14, 0x30, 0x19, 0xF0, 0x00, 0x00 }	// menu, just present for current menu code
+	{ 0x0A, 0x96, 0x14, 0x30, 0x19, 0xF0, 0x00, 0x00 }  // menu, just present for current menu code
 };
 
 const int Screen_HoF::_screenDimTableCount = ARRAYSIZE(Screen_HoF::_screenDimTable);
@@ -1253,7 +1254,7 @@ void GUI_LoK::initStaticResource() {
 	_menu[0].item[3].callback = quitPlayingFunctor;
 	_menu[0].item[4].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::resumeGame);
 
-	GUI_V1_MENU(_menu[1], -1, -1, 0x140, 0x38, 248, 249, 250, 0, 254,-1, 8, 0, 2, -1, -1, -1, -1);
+	GUI_V1_MENU(_menu[1], -1, -1, 0x140, 0x38, 248, 249, 250, 0, 254, -1, 8, 0, 2, -1, -1, -1, -1);
 	GUI_V1_MENU_ITEM(_menu[1].item[0], 1, 0, 0, 0, 0x18, 0, 0x1E, 0x48, 0x0F, 252, 253, -1, 255, 248, 249, 250, -1, 0, 0, 0, 0, 0);
 	GUI_V1_MENU_ITEM(_menu[1].item[1], 1, 0, 0, 0, 0xD8, 0, 0x1E, 0x48, 0x0F, 252, 253, -1, 255, 248, 249, 250, -1, 0, 0, 0, 0, 0);
 	_menu[1].item[0].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::quitConfirmYes);
@@ -1346,7 +1347,7 @@ void KyraEngine_LoK::setupButtonData() {
 		_buttonData[i].buttonCallback = amuletFunctor;
 
 	for (int i = 1; i < 15; ++i)
-		_buttonDataListPtr[i-1] = &_buttonData[i];
+		_buttonDataListPtr[i - 1] = &_buttonData[i];
 	_buttonDataListPtr[14] = 0;
 }
 
@@ -1417,7 +1418,7 @@ const char *const KyraEngine_HoF::_languageExtension[] = {
 	"ENG",
 	"FRE",
 	"GER",/*,
-	"ITA",		Italian and Spanish were never included
+	"ITA",      Italian and Spanish were never included
 	"SPA"*/
 	"JPN",
 };
@@ -1426,7 +1427,7 @@ const char *const KyraEngine_HoF::_scriptLangExt[] = {
 	"EMC",
 	"FMC",
 	"GMC",/*,
-	"IMC",		Italian and Spanish were never included
+	"IMC",      Italian and Spanish were never included
 	"SMC"*/
 	"JMC"
 };
@@ -1605,7 +1606,7 @@ void KyraEngine_HoF::initInventoryButtonList() {
 	GUI_V2_BUTTON(_inventoryButtons[1], 0x2, 0x00, 0, 1, 1, 1, 0x4487, 0, 0x104, 0x90, 0x3C, 0x2C, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 	_inventoryButtons[1].buttonCallback = BUTTON_FUNCTOR(KyraEngine_HoF, this, &KyraEngine_HoF::cauldronButton);
 
-	GUI_V2_BUTTON(_inventoryButtons[2],	0x5, 0x00, 0, 1, 1, 1, 0x4487, 0, 0x0FA, 0x90, 0x0A, 0x2C, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
+	GUI_V2_BUTTON(_inventoryButtons[2], 0x5, 0x00, 0, 1, 1, 1, 0x4487, 0, 0x0FA, 0x90, 0x0A, 0x2C, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 	_inventoryButtons[2].buttonCallback = BUTTON_FUNCTOR(KyraEngine_HoF, this, &KyraEngine_HoF::cauldronClearButton);
 
 	GUI_V2_BUTTON(_inventoryButtons[3], 0x3, 0x00, 0, 1, 1, 1, 0x4487, 0, 0x0CE, 0x90, 0x2C, 0x2C, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
@@ -1639,14 +1640,14 @@ void GUI_HoF::initStaticData() {
 	GUI_V2_BUTTON(_scrollDownButton, 0x18, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x18, 0x0F, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[0][i], 0x18+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
+		GUI_V2_BUTTON(_sliderButtons[0][i], 0x18 + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[1][i], 0x1C+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
+		GUI_V2_BUTTON(_sliderButtons[1][i], 0x1C + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[2][i], 0x20+i, 0, 0, 0, 0, 0, 0x2200, 0, 0, 0, 0x6E, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
+		GUI_V2_BUTTON(_sliderButtons[2][i], 0x20 + i, 0, 0, 0, 0, 0, 0x2200, 0, 0, 0, 0x6E, 0x0E, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 
 	for (uint i = 0; i < ARRAYSIZE(_menuButtons); ++i)
-		GUI_V2_BUTTON(_menuButtons[i], 0x10+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0, 0, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
+		GUI_V2_BUTTON(_menuButtons[i], 0x10 + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0, 0, 0xC7, 0xCF, 0xC7, 0xCF, 0xC7, 0xCF, 0);
 
 	Button::Callback clickLoadSlotFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::clickLoadSlot);
 	Button::Callback clickSaveSlotFunctor = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::clickSaveSlot);
@@ -1679,7 +1680,7 @@ void GUI_HoF::initStaticData() {
 		_mainMenu.numberOfItems = 6;
 		_mainMenu.item[6].enabled = false;
 		for (int i = 4; i < 6; ++i)
-			_mainMenu.item[i].callback = _mainMenu.item[i+1].callback;
+			_mainMenu.item[i].callback = _mainMenu.item[i + 1].callback;
 		_mainMenu.item[3].callback = BUTTON_FUNCTOR(GUI_HoF, this, &GUI_HoF::gameOptions);
 		_mainMenu.item[6].callback = Button::Callback();
 		_mainMenu.item[5].y = 0x7F;
@@ -1781,25 +1782,25 @@ void GUI_HoF::initStaticData() {
 }
 
 const uint16 GUI_HoF::_menuStringsTalkie[] = {
-	0x001, 0x002, 0x003, 0x023, 0x004, 0x025, 0x005, 0x006,	// Main Menu String IDs
-	0x025, 0x000, 0x000, 0x000, 0x010, 0x000, 0x000, 0x000,	// Options Menu String IDs
-	0x007, 0x000, 0x000, 0x000, 0x010, 0x000, 0x000, 0x000,	// Audio Menu String IDs
-	0x000, 0x014, 0x013, 0x000, 0x000, 0x000, 0x000, 0x000,	// Menu3 Menu String IDs
-	0x008, 0x029, 0x02A, 0x02B, 0x02C, 0x02D, 0x00B, 0x000,	// Load Menu String IDs
-	0x009, 0x029, 0x02A, 0x02B, 0x02C, 0x02D, 0x00B, 0x000,	// Save Menu String IDs
-	0x00C, 0x00D, 0x00B, 0x000, 0x000, 0x000, 0x000, 0x000,	// Menu6 Menu String IDs
-	0x00E, 0x002, 0x005, 0x000, 0x000, 0x000, 0x000, 0x000	// Death Menu String IDs
+	0x001, 0x002, 0x003, 0x023, 0x004, 0x025, 0x005, 0x006, // Main Menu String IDs
+	0x025, 0x000, 0x000, 0x000, 0x010, 0x000, 0x000, 0x000, // Options Menu String IDs
+	0x007, 0x000, 0x000, 0x000, 0x010, 0x000, 0x000, 0x000, // Audio Menu String IDs
+	0x000, 0x014, 0x013, 0x000, 0x000, 0x000, 0x000, 0x000, // Menu3 Menu String IDs
+	0x008, 0x029, 0x02A, 0x02B, 0x02C, 0x02D, 0x00B, 0x000, // Load Menu String IDs
+	0x009, 0x029, 0x02A, 0x02B, 0x02C, 0x02D, 0x00B, 0x000, // Save Menu String IDs
+	0x00C, 0x00D, 0x00B, 0x000, 0x000, 0x000, 0x000, 0x000, // Menu6 Menu String IDs
+	0x00E, 0x002, 0x005, 0x000, 0x000, 0x000, 0x000, 0x000  // Death Menu String IDs
 };
 
 const uint16 GUI_HoF::_menuStringsOther[] = {
-	0x009, 0x00A, 0x00B, 0x001, 0x00C, 0x00D, 0x00E, 0x000,	// Main Menu String IDs
-	0x00F, 0x02B, 0x02C, 0x02D, 0x02E, 0x018, 0x000, 0x000,	// Options Menu String IDs
-	0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000,	// Dummy
-	0x000, 0x01C, 0x01B, 0x000, 0x000, 0x000, 0x000, 0x000,	// Menu3 Menu String IDs
-	0x010, 0x02F, 0x030, 0x031, 0x032, 0x033, 0x013, 0x000,	// Load Menu String IDs
-	0x011, 0x02F, 0x030, 0x031, 0x032, 0x033, 0x013, 0x000,	// Save Menu String IDs
-	0x014, 0x015, 0x013, 0x3E8, 0x000, 0x000, 0x000, 0x000,	// Menu6 String IDs
-	0x016, 0x00A, 0x00D, 0x000, 0x000, 0x000, 0x000, 0x000	// Death Menu String IDs
+	0x009, 0x00A, 0x00B, 0x001, 0x00C, 0x00D, 0x00E, 0x000, // Main Menu String IDs
+	0x00F, 0x02B, 0x02C, 0x02D, 0x02E, 0x018, 0x000, 0x000, // Options Menu String IDs
+	0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, 0x000, // Dummy
+	0x000, 0x01C, 0x01B, 0x000, 0x000, 0x000, 0x000, 0x000, // Menu3 Menu String IDs
+	0x010, 0x02F, 0x030, 0x031, 0x032, 0x033, 0x013, 0x000, // Load Menu String IDs
+	0x011, 0x02F, 0x030, 0x031, 0x032, 0x033, 0x013, 0x000, // Save Menu String IDs
+	0x014, 0x015, 0x013, 0x3E8, 0x000, 0x000, 0x000, 0x000, // Menu6 String IDs
+	0x016, 0x00A, 0x00D, 0x000, 0x000, 0x000, 0x000, 0x000  // Death Menu String IDs
 };
 
 const uint16 KyraEngine_HoF::_itemMagicTable[] = {
@@ -1915,20 +1916,20 @@ const char *const KyraEngine_MR::_languageExtension[] = {
 	"TRE",
 	"TRF",
 	"TRG"/*,
-	"TRI",		Italian and Spanish were never included, the supported fan translations are using
-	"TRS"		English/French extensions thus overwriting these languages */
+	"TRI",      Italian and Spanish were never included, the supported fan translations are using
+	"TRS"       English/French extensions thus overwriting these languages */
 };
 
 const int KyraEngine_MR::_languageExtensionSize = ARRAYSIZE(KyraEngine_MR::_languageExtension);
 
-const char * const KyraEngine_MR::_mainMenuSpanishFan[] = {
+const char *const KyraEngine_MR::_mainMenuSpanishFan[] = {
 	"Nueva Partida",
 	"Ver Intro",
 	"Restaurar",
 	"Finalizar"
 };
 
-const char * const KyraEngine_MR::_mainMenuItalianFan[] = {
+const char *const KyraEngine_MR::_mainMenuItalianFan[] = {
 	"Nuova Partita",
 	"Introduzione",
 	"Carica una partita",
@@ -2024,13 +2025,13 @@ void KyraEngine_MR::initMainButtonList(bool disable) {
 
 		Button::Callback buttonInventoryFunctor = BUTTON_FUNCTOR(KyraEngine_MR, this, &KyraEngine_MR::buttonInventory);
 		for (int i = 0; i < 5; ++i) {
-			GUI_V2_BUTTON(_mainButtonData[i+4], i+5, 0, 0, 0, 0, 0, 0x1100, 0, 67+i*28, 155, 27, 21, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
-			_mainButtonData[i+4].buttonCallback = buttonInventoryFunctor;
+			GUI_V2_BUTTON(_mainButtonData[i + 4], i + 5, 0, 0, 0, 0, 0, 0x1100, 0, 67 + i * 28, 155, 27, 21, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+			_mainButtonData[i + 4].buttonCallback = buttonInventoryFunctor;
 		}
 
 		for (int i = 0; i < 5; ++i) {
-			GUI_V2_BUTTON(_mainButtonData[i+9], i+10, 0, 0, 0, 0, 0, 0x1100, 0, 67+i*28, 177, 27, 21, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
-			_mainButtonData[i+9].buttonCallback = buttonInventoryFunctor;
+			GUI_V2_BUTTON(_mainButtonData[i + 9], i + 10, 0, 0, 0, 0, 0, 0x1100, 0, 67 + i * 28, 177, 27, 21, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+			_mainButtonData[i + 9].buttonCallback = buttonInventoryFunctor;
 		}
 
 		for (int i = 0; i < 14; ++i)
@@ -2052,14 +2053,14 @@ void GUI_MR::initStaticData() {
 	GUI_V2_BUTTON(_scrollDownButton, 23, 0, 0, 4, 4, 4, 0x4487, 0, 0, 0, 0x18, 0x0F, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
 
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[0][i], 0x18+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+		GUI_V2_BUTTON(_sliderButtons[0][i], 0x18 + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[1][i], 0x1C+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+		GUI_V2_BUTTON(_sliderButtons[1][i], 0x1C + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0x0A, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
 	for (int i = 0; i < 4; ++i)
-		GUI_V2_BUTTON(_sliderButtons[2][i], 0x20+i, 0, 0, 0, 0, 0, 0x2200, 0, 0, 0, 0x6E, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+		GUI_V2_BUTTON(_sliderButtons[2][i], 0x20 + i, 0, 0, 0, 0, 0, 0x2200, 0, 0, 0, 0x6E, 0x0E, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
 
 	for (uint i = 0; i < ARRAYSIZE(_menuButtons); ++i)
-		GUI_V2_BUTTON(_menuButtons[i], 0x0F+i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0, 0, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
+		GUI_V2_BUTTON(_menuButtons[i], 0x0F + i, 0, 0, 1, 1, 1, 0x4487, 0, 0, 0, 0, 0, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
 
 	Button::Callback clickLoadSlotFunctor = BUTTON_FUNCTOR(GUI_MR, this, &GUI_MR::clickLoadSlot);
 	Button::Callback clickSaveSlotFunctor = BUTTON_FUNCTOR(GUI_MR, this, &GUI_MR::clickSaveSlot);
@@ -2158,7 +2159,7 @@ void GUI_MR::initStaticData() {
 }
 
 const int8 KyraEngine_MR::_albumWSAX[] = {
-	  0, 77, -50, 99, -61, 82, -58, 85,
+	 0, 77, -50, 99, -61, 82, -58, 85,
 	-64, 80, -63, 88, -63, 88, -64,  0
 };
 
diff --git a/engines/kyra/text_lok.cpp b/engines/kyra/text_lok.cpp
index 0ee3574..62bdf18 100644
--- a/engines/kyra/text_lok.cpp
+++ b/engines/kyra/text_lok.cpp
@@ -188,7 +188,7 @@ int8 KyraEngine_LoK::getChatPartnerNum() {
 
 	for (int i = 1; i < 6; i++) {
 		if (_currentCharacter->sceneId == sceneTable[pos]) {
-			partner = sceneTable[pos+1];
+			partner = sceneTable[pos + 1];
 			break;
 		}
 		pos += 2;
@@ -342,12 +342,12 @@ void KyraEngine_LoK::drawSentenceCommand(const char *sentence, int color) {
 			_currSentenceColor[2] = 0x3F;
 
 			_screen->setInterfacePalette(_screen->getPalette(1),
-					_currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]);
+			                             _currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]);
 		}
 	} else if (_startSentencePalIndex != color || _fadeText != false) {
-		_currSentenceColor[0] = _screen->getPalette(0)[765] = _screen->getPalette(0)[color*3+0];
-		_currSentenceColor[1] = _screen->getPalette(0)[766] = _screen->getPalette(0)[color*3+1];
-		_currSentenceColor[2] = _screen->getPalette(0)[767] = _screen->getPalette(0)[color*3+2];
+		_currSentenceColor[0] = _screen->getPalette(0)[765] = _screen->getPalette(0)[color * 3 + 0];
+		_currSentenceColor[1] = _screen->getPalette(0)[766] = _screen->getPalette(0)[color * 3 + 1];
+		_currSentenceColor[2] = _screen->getPalette(0)[767] = _screen->getPalette(0)[color * 3 + 2];
 
 		_screen->setScreenPalette(_screen->getPalette(0));
 		_startSentencePalIndex = color;
@@ -377,16 +377,15 @@ void KyraEngine_LoK::updateTextFade() {
 	for (int i = 0; i < 3; i++) {
 		if (_currSentenceColor[i] > 4)
 			_currSentenceColor[i] -= 4;
-		else
-			if (_currSentenceColor[i]) {
-				_currSentenceColor[i] = 0;
-				finished = true;
-			}
+		else if (_currSentenceColor[i]) {
+			_currSentenceColor[i] = 0;
+			finished = true;
+		}
 	}
 
 	if (_flags.platform == Common::kPlatformAmiga) {
 		_screen->setInterfacePalette(_screen->getPalette(1),
-				_currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]);
+		                             _currSentenceColor[0], _currSentenceColor[1], _currSentenceColor[2]);
 	} else {
 		_screen->getPalette(0)[765] = _currSentenceColor[0];
 		_screen->getPalette(0)[766] = _currSentenceColor[1];
diff --git a/engines/kyra/timer_lok.cpp b/engines/kyra/timer_lok.cpp
index 555b368..13f5403 100644
--- a/engines/kyra/timer_lok.cpp
+++ b/engines/kyra/timer_lok.cpp
@@ -155,7 +155,7 @@ void KyraEngine_LoK::setTextFadeTimerCountdown(int16 countdown) {
 	if (countdown == -1)
 		countdown = 32000;
 
-	_timer->setCountdown(31, countdown*60);
+	_timer->setCountdown(31, countdown * 60);
 }
 
 void KyraEngine_LoK::timerAsInvisibleTimeout(int timerNum) {
diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp
index 076c586..f6aca2b 100644
--- a/engines/kyra/wsamovie.cpp
+++ b/engines/kyra/wsamovie.cpp
@@ -28,10 +28,12 @@
 namespace Kyra {
 
 WSAMovie_v1::WSAMovie_v1(KyraEngine_v1 *vm)
-    : Movie(vm), _frameData(0), _frameOffsTable(0), _offscreenBuffer(0), _deltaBuffer(0) {
+	: Movie(vm), _frameData(0), _frameOffsTable(0), _offscreenBuffer(0), _deltaBuffer(0) {
 }
 
-WSAMovie_v1::~WSAMovie_v1() { close(); }
+WSAMovie_v1::~WSAMovie_v1() {
+	close();
+}
 
 int WSAMovie_v1::open(const char *filename, int offscreenDecode, Palette *palBuf) {
 	close();
@@ -251,7 +253,7 @@ void WSAMovieAmiga::displayFrame(int frameNum, int pageNum, int x, int y, uint16
 
 	uint8 *dst;
 	dst = _buffer;
-	memset(_buffer, 0, _width*_height);
+	memset(_buffer, 0, _width * _height);
 
 	if (_currentFrame == _numFrames) {
 		if (!(_flags & WF_NO_FIRST_FRAME)) {
@@ -330,7 +332,7 @@ void WSAMovieAmiga::processFrame(int frameNum, uint8 *dst) {
 		return;
 	assert(frameNum <= _numFrames);
 
-	memset(dst, 0, _width*_height);
+	memset(dst, 0, _width * _height);
 
 	const uint8 *src = _frameData + _frameOffsTable[frameNum];
 	Screen::decodeFrame4(src, _deltaBuffer, _deltaBufferSize);






More information about the Scummvm-git-logs mailing list