KYRA: Some formatting fixes.

12 files changed, 658 insertions, 649 deletions

diff --git a/engines/kyra/eob.cpp b/engines/kyra/eob.cpp
index 0010a51779..96eb388699 100644
--- a/engines/kyra/eob.cpp
+++ b/engines/kyra/eob.cpp
@@ -28,16 +28,22 @@
 
 namespace Kyra {
 
-EoBEngine::EoBEngine(OSystem *system, const GameFlags &flags) : EoBCoreEngine(system, flags) {
+EoBEngine::EoBEngine(OSystem *system, const GameFlags &flags)
+	: EoBCoreEngine(system, flags) {
 	_numSpells = 53;
 	_menuChoiceInit = 4;
 
-	_turnUndeadString = _introFilesOpening = _introFilesTower = _introFilesOrb = _introFilesWdEntry	= _introFilesKing = _introFilesHands = _introFilesWdExit =
-		_introFilesTunnel = _finBonusStrings = _npcStrings[1] = _npcStrings[2] = _npcStrings[3] = _npcStrings[4] = _npcStrings[5] = _npcStrings[6] = _npcStrings[7]	=
-		_npcStrings[8] = _npcStrings[9]	= _npcStrings[10] = 0;
-	_introOpeningFrmDelay = _introWdEncodeX	= _introWdEncodeY = _introWdEncodeWH = _npcShpData = _npcSubShpIndex1 = _npcSubShpIndex2 = _npcSubShpY = _introWdDsY =
-		_introTvlX1 = _introTvlY1 = _introTvlX2	= _introTvlY2 = _introTvlW = _introTvlH = _dscDoorScaleMult4 = _dscDoorScaleMult5 = _dscDoorScaleMult6 =
-		_dscDoorY3 = _dscDoorY4 = _dscDoorY5 = _dscDoorY6 = _dscDoorY7 = _doorShapeEncodeDefs = _doorSwitchShapeEncodeDefs = _doorSwitchCoords = 0;
+	_turnUndeadString = _introFilesOpening = _introFilesTower = _introFilesOrb = 0;
+	_introFilesWdEntry = _introFilesKing = _introFilesHands = _introFilesWdExit = 0;
+	_introFilesTunnel = _finBonusStrings = _npcStrings[1] = _npcStrings[2] = 0;
+	_npcStrings[3] = _npcStrings[4] = _npcStrings[5] = _npcStrings[6] = 0;
+	_npcStrings[7] = _npcStrings[8] = _npcStrings[9] = _npcStrings[10] = 0;
+	_introOpeningFrmDelay = _introWdEncodeX = _introWdEncodeY = _introWdEncodeWH = 0;
+	_npcShpData = _npcSubShpIndex1 = _npcSubShpIndex2 = _npcSubShpY = _introWdDsY = 0;
+	_introTvlX1 = _introTvlY1 = _introTvlX2 = _introTvlY2 = _introTvlW = _introTvlH = 0;
+	_dscDoorScaleMult4 = _dscDoorScaleMult5 = _dscDoorScaleMult6 = _dscDoorY3 = 0;
+	_dscDoorY4 = _dscDoorY5 = _dscDoorY6 = _dscDoorY7 = _doorShapeEncodeDefs = 0;
+	_doorSwitchShapeEncodeDefs = _doorSwitchCoords = 0;
 	_introWdDsX = 0;
 	_dscDoorCoordsExt = 0;
 }
@@ -176,7 +182,7 @@ void EoBEngine::runNpcDialogue(int npcIndex) {
 
 	switch (npcIndex) {
 	case 0:
-		for (r = 1; r == 1; ) {
+		for (r = 1; r == 1;) {
 			gui_drawDialogueBox();
 			r = DLG2A3(checkScriptFlags(0x2000), 8, 2, 1);
 			if (r == 1) {
@@ -238,7 +244,7 @@ void EoBEngine::runNpcDialogue(int npcIndex) {
 		}
 
 		if (!r)
-			 _txt->printDialogueText(_npcStrings[0][0], true);
+			_txt->printDialogueText(_npcStrings[0][0], true);
 
 		break;
 
@@ -293,7 +299,7 @@ void EoBEngine::runNpcDialogue(int npcIndex) {
 					itm = _characters[a].inventory[r];
 					if (itm && (_items[itm].type < 51 || _items[itm].type > 56)) {
 						_characters[a].inventory[r] = 0;
-						setItemPosition((Item*)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
+						setItemPosition((Item *)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
 					}
 				}
 			}
@@ -391,7 +397,7 @@ void EoBEngine::loadDoorShapes(int doorType1, int shapeId1, int doorType2, int s
 			enc = &_doorSwitchShapeEncodeDefs[(doorType2 * 3 + i) << 2];
 			_doorSwitches[shapeId2 + i].shp = _screen->encodeShape(enc[0], enc[1], enc[2], enc[3]);
 			_doorSwitches[shapeId2 + i].x = _doorSwitchCoords[doorType2 * 6 + i * 2];
-			_doorSwitches[shapeId2 + i].y = _doorSwitchCoords[doorType2 * 6 + i * 2+ 1];
+			_doorSwitches[shapeId2 + i].y = _doorSwitchCoords[doorType2 * 6 + i * 2 + 1];
 		}
 	}
 
@@ -408,62 +414,62 @@ void EoBEngine::drawDoorIntern(int type, int index, int x, int y, int w, int wal
 	const ScreenDim *td = _screen->getScreenDim(5);
 
 	switch (_currentLevel) {
-		case 4:
-		case 5:
-		case 6:
-			y = _dscDoorY6[mDim] - shp[1];
-			d1 = _dscDoorCoordsExt[index << 1] >> 3;
-			d2 = _dscDoorCoordsExt[(index << 1) + 1] >> 3;
-			if (_shpDmX1 > d1)
-				d1 = _shpDmX1;
-			if (_shpDmX2 < d2)
-				d2 = _shpDmX2;
-			_screen->modifyScreenDim(5, d1, td->sy, d2 - d1, td->h);
-			v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult3[mDim] : _dscDoorScaleMult4[mDim]) * -1;
-			v -= (shp[2] << 3);
-			drawBlockObject(0, 2, shp, x + v, y, 5);
-			v += (shp[2] << 3);
-			drawBlockObject(1, 2, shp, x - v, y, 5);
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w - v, _doorSwitches[shapeIndex].y, 5);
-			break;
+	case 4:
+	case 5:
+	case 6:
+		y = _dscDoorY6[mDim] - shp[1];
+		d1 = _dscDoorCoordsExt[index << 1] >> 3;
+		d2 = _dscDoorCoordsExt[(index << 1) + 1] >> 3;
+		if (_shpDmX1 > d1)
+			d1 = _shpDmX1;
+		if (_shpDmX2 < d2)
+			d2 = _shpDmX2;
+		_screen->modifyScreenDim(5, d1, td->sy, d2 - d1, td->h);
+		v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult3[mDim] : _dscDoorScaleMult4[mDim]) * -1;
+		v -= (shp[2] << 3);
+		drawBlockObject(0, 2, shp, x + v, y, 5);
+		v += (shp[2] << 3);
+		drawBlockObject(1, 2, shp, x - v, y, 5);
+		if (_wllShapeMap[wall] == -1)
+			drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w - v, _doorSwitches[shapeIndex].y, 5);
+		break;
 
-		case 7:
-		case 8:
-		case 9:
-			y = _dscDoorY3[mDim] - _doorShapes[shapeIndex + 3][1];
-			d1 = x - (_doorShapes[shapeIndex + 3][2] << 2);
-			x -= (shp[2] << 2);
-			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], d1, y, 5);
-			scaleLevelShapesDim(index, y1, y2, 5);
-			y = _dscDoorY3[mDim] - ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim] : _dscDoorScaleMult2[mDim]);
-			drawBlockObject(0, 2, shp, x, y, 5);
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
-			break;
+	case 7:
+	case 8:
+	case 9:
+		y = _dscDoorY3[mDim] - _doorShapes[shapeIndex + 3][1];
+		d1 = x - (_doorShapes[shapeIndex + 3][2] << 2);
+		x -= (shp[2] << 2);
+		drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], d1, y, 5);
+		scaleLevelShapesDim(index, y1, y2, 5);
+		y = _dscDoorY3[mDim] - ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim] : _dscDoorScaleMult2[mDim]);
+		drawBlockObject(0, 2, shp, x, y, 5);
+		if (_wllShapeMap[wall] == -1)
+			drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+		break;
 
-		case 10:
-		case 11:
-			v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult5[mDim] : _dscDoorScaleMult6[mDim]) * -1;
-			x -= (shp[2] << 2);
-			y = _dscDoorY4[mDim] + v;
-			drawBlockObject(0, 2, shp, x, y + v, 5);
-			v = (v >> 3) + (v >> 2);
-			y = _dscDoorY5[mDim];
-			drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], x, y - v, 5);
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
-			break;
+	case 10:
+	case 11:
+		v = ((wall < 30) ? (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult5[mDim] : _dscDoorScaleMult6[mDim]) * -1;
+		x -= (shp[2] << 2);
+		y = _dscDoorY4[mDim] + v;
+		drawBlockObject(0, 2, shp, x, y + v, 5);
+		v = (v >> 3) + (v >> 2);
+		y = _dscDoorY5[mDim];
+		drawBlockObject(0, 2, _doorShapes[shapeIndex + 3], x, y - v, 5);
+		if (_wllShapeMap[wall] == -1)
+			drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+		break;
 
-		default:
-			y = (_currentLevel == 12 ? _dscDoorY6[mDim] : _dscDoorY1[mDim]) - shp[1];
-			x -= (shp[2] << 2);
-			y -= (wall >= 30 ? _dscDoorScaleMult2[mDim] : (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim]);
-			drawBlockObject(0, 2, shp, x, y, 5);
+	default:
+		y = (_currentLevel == 12 ? _dscDoorY6[mDim] : _dscDoorY1[mDim]) - shp[1];
+		x -= (shp[2] << 2);
+		y -= (wall >= 30 ? _dscDoorScaleMult2[mDim] : (wall - _dscDoorScaleOffs[wall]) * _dscDoorScaleMult1[mDim]);
+		drawBlockObject(0, 2, shp, x, y, 5);
 
-			if (_wllShapeMap[wall] == -1)
-				drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
-			break;
+		if (_wllShapeMap[wall] == -1)
+			drawBlockObject(0, 2, _doorSwitches[shapeIndex].shp, _doorSwitches[shapeIndex].x + w, _doorSwitches[shapeIndex].y, 5);
+		break;
 	}
 }
 
@@ -567,6 +573,6 @@ void EoBEngine::healParty() {
 	}
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp
index 080af941df..51a9e52266 100644
--- a/engines/kyra/gui_eob.cpp
+++ b/engines/kyra/gui_eob.cpp
@@ -300,26 +300,26 @@ void EoBCoreEngine::gui_drawWeaponSlotStatus(int x, int y, int status) {
 		gui_drawBox(x, y, 31, 16, _color9, _color10, _color11);
 
 	switch (status + 5) {
-		case 0:
-			tmpStr = _characterGuiStringsWp[2];
-			break;
-		case 1:
-			tmpStr = _characterGuiStringsWr[2];
-			tmpStr2 = _characterGuiStringsWr[3];
-			break;
-		case 2:
-			tmpStr = _characterGuiStringsWr[0];
-			tmpStr2 = _characterGuiStringsWr[1];
-			break;
-		case 3:
-			tmpStr = _characterGuiStringsWp[1];
-			break;
-		case 4:
-			tmpStr = _characterGuiStringsWp[0];
-			break;
-		default:
-			tmpStr = Common::String::format("%d", status);
-			break;
+	case 0:
+		tmpStr = _characterGuiStringsWp[2];
+		break;
+	case 1:
+		tmpStr = _characterGuiStringsWr[2];
+		tmpStr2 = _characterGuiStringsWr[3];
+		break;
+	case 2:
+		tmpStr = _characterGuiStringsWr[0];
+		tmpStr2 = _characterGuiStringsWr[1];
+		break;
+	case 3:
+		tmpStr = _characterGuiStringsWp[1];
+		break;
+	case 4:
+		tmpStr = _characterGuiStringsWp[0];
+		break;
+	default:
+		tmpStr = Common::String::format("%d", status);
+		break;
 	}
 
 	if (!tmpStr2.empty()) {
@@ -433,8 +433,8 @@ void EoBCoreEngine::gui_drawCharPortraitStatusFrame(int index) {
 			return;
 		}
 
-		int iX= x;
-		int iY= y;
+		int iX = x;
+		int iY = y;
 
 		for (int i = 0; i < 64; i += 16) {
 			x = iX + i;
@@ -790,11 +790,11 @@ int EoBCoreEngine::clickedSceneDropPickupItem(Button *button) {
 	int d = _dropItemDirIndex[(_currentDirection << 2) + button->arg];
 
 	if (_itemInHand) {
-		setItemPosition((Item*)&_levelBlockProperties[block & 0x3ff].drawObjects, block, _itemInHand, d);
+		setItemPosition((Item *)&_levelBlockProperties[block & 0x3ff].drawObjects, block, _itemInHand, d);
 		setHandItem(0);
 		runLevelScript(block, 4);
 	} else {
-		d = getQueuedItem((Item*)&_levelBlockProperties[block].drawObjects, d, -1);
+		d = getQueuedItem((Item *)&_levelBlockProperties[block].drawObjects, d, -1);
 		if (!d)
 			return 1;
 		setHandItem(d);
@@ -975,7 +975,7 @@ int EoBCoreEngine::clickedSpellbookList(Button *button) {
 		if (listIndex == 7 || _openBookAvailableSpells[_openBookSpellLevel * 10 + _openBookSpellListOffset + listIndex] > 0) {
 			if (listIndex < 6) {
 				if (_openBookSpellListOffset + listIndex < 9)
-					_openBookSpellSelectedItem= listIndex;
+					_openBookSpellSelectedItem = listIndex;
 				else if (listIndex != 7)
 					return button->index;
 			} else if (listIndex != 7) {
@@ -994,7 +994,7 @@ int EoBCoreEngine::clickedSpellbookList(Button *button) {
 
 				castSpell(s, 0);
 
-			} else if ((_openBookSpellSelectedItem == 6 && listIndex == 7) || (_openBookSpellSelectedItem != 6 && listIndex == 6) ) {
+			} else if ((_openBookSpellSelectedItem == 6 && listIndex == 7) || (_openBookSpellSelectedItem != 6 && listIndex == 6)) {
 				Button b;
 				clickedSpellbookAbort(&b);
 			}
@@ -1223,81 +1223,81 @@ void EoBCoreEngine::gui_processWeaponSlotClickRight(int charIndex, int slotIndex
 	uint8 ep = _itemTypes[tp].extraProperties & 0x7f;
 
 	switch (ep) {
-		case 0:
-		case 16:
-			// Item automatically used when worn
-			_txt->printMessage(_itemMisuseStrings[1]);
-			break;
-
-		case 1:
-		case 2:
-		case 3:
-			// Weapons
-			if (!_currentControlMode)
-				useSlotWeapon(charIndex, slotIndex, itm);
-			break;
-
-		case 4:
-		case 8:
-		case 12:
-		case 13:
-		case 15:
-			// Item not used that way
-			_txt->printMessage(_itemMisuseStrings[2]);
-			break;
-
-		case 5:
-		case 6:
-			// Cleric holy symbol / mage spell book
-			if (!_currentControlMode)
-				useMagicBookOrSymbol(charIndex, ep == 6 ? 1 : 0);
-			break;
-
-		case 7:
-			// Food ration
-			// Don't do anything if mouse control is enabled (we don't support anything else)
-			// eatItemInHand(charIndex);
-			break;
-
-		case 10:
-			if (_flags.gameID == GI_EOB1)
-				vl += _clericSpellOffset;
-			// drop through
-		case 9:
-			// Mage/Cleric Scroll
-			if (!_currentControlMode)
-				useMagicScroll(charIndex, vl, wslot);
-			break;
-
-		case 11:
-			// Letters, Notes, Maps
-			displayParchment(vl);
-			break;
-
-		case 14:
-			// Potion
-			usePotion(charIndex, wslot);
-			break;
-
-		case 18:
-			useWand(charIndex, wslot);
-			break;
-
-		case 19:
-			// eob2 horn
-			useHorn(charIndex, wslot);
-			break;
-
-		case 20:
-			if (vl == 1)
-				inflictCharacterDamage(charIndex, 200);
-			else
-				useMagicScroll(charIndex, 55, wslot);
-			deleteInventoryItem(charIndex, wslot);
-			break;
+	case 0:
+	case 16:
+		// Item automatically used when worn
+		_txt->printMessage(_itemMisuseStrings[1]);
+		break;
+
+	case 1:
+	case 2:
+	case 3:
+		// Weapons
+		if (!_currentControlMode)
+			useSlotWeapon(charIndex, slotIndex, itm);
+		break;
+
+	case 4:
+	case 8:
+	case 12:
+	case 13:
+	case 15:
+		// Item not used that way
+		_txt->printMessage(_itemMisuseStrings[2]);
+		break;
+
+	case 5:
+	case 6:
+		// Cleric holy symbol / mage spell book
+		if (!_currentControlMode)
+			useMagicBookOrSymbol(charIndex, ep == 6 ? 1 : 0);
+		break;
+
+	case 7:
+		// Food ration
+		// Don't do anything if mouse control is enabled (we don't support anything else)
+		// eatItemInHand(charIndex);
+		break;
+
+	case 10:
+		if (_flags.gameID == GI_EOB1)
+			vl += _clericSpellOffset;
+		// drop through
+	case 9:
+		// Mage/Cleric Scroll
+		if (!_currentControlMode)
+			useMagicScroll(charIndex, vl, wslot);
+		break;
+
+	case 11:
+		// Letters, Notes, Maps
+		displayParchment(vl);
+		break;
+
+	case 14:
+		// Potion
+		usePotion(charIndex, wslot);
+		break;
+
+	case 18:
+		useWand(charIndex, wslot);
+		break;
+
+	case 19:
+		// eob2 horn
+		useHorn(charIndex, wslot);
+		break;
+
+	case 20:
+		if (vl == 1)
+			inflictCharacterDamage(charIndex, 200);
+		else
+			useMagicScroll(charIndex, 55, wslot);
+		deleteInventoryItem(charIndex, wslot);
+		break;
 
-		default:
-			break;
+	default:
+		break;
 	}
 
 	if (_flags.gameID == GI_EOB1 || (ep == 1 && charIndex >= 2))
@@ -1336,7 +1336,7 @@ void EoBCoreEngine::gui_processInventorySlotClick(int slot) {
 
 GUI_EoB::GUI_EoB(EoBCoreEngine *vm) : GUI(vm), _vm(vm), _screen(vm->_screen) {
 	_menuStringsPrefsTemp = new char*[4];
-	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char*));
+	memset(_menuStringsPrefsTemp, 0, 4 * sizeof(char *));
 
 	_saveSlotStringsTemp = new char*[6];
 	for (int i = 0; i < 6; i++) {
@@ -1429,7 +1429,7 @@ void GUI_EoB::processButton(Button *button) {
 				_screen->drawShape(_screen->_curPage, button->data1ShapePtr, fx, fy, sd);
 			} else if (button->data0Val1 == 2) {
 				if (!(button->flags2 & 4))
-					_screen->printText((const char*) button->data1ShapePtr, sx, sy, col1, col2);
+					_screen->printText((const char *)button->data1ShapePtr, sx, sy, col1, col2);
 			} else if (button->data0Val1 == 3) {
 				// nullsub (at least EOBII)
 			} else if (button->data0Val1 == 4) {
@@ -1453,9 +1453,9 @@ void GUI_EoB::processButton(Button *button) {
 				_screen->drawShape(_screen->_curPage, button->data2ShapePtr, fx, fy, sd);
 			} else if (button->data0Val1 == 2) {
 				if (button->flags2 & 1)
-					_screen->printText((const char*) button->data2ShapePtr, sx, sy, button->data3Val2, button->data3Val3);
+					_screen->printText((const char *)button->data2ShapePtr, sx, sy, button->data3Val2, button->data3Val3);
 				else
-					_screen->printText((const char*) button->data2ShapePtr, sx, sy, button->data2Val2, button->data2Val3);
+					_screen->printText((const char *)button->data2ShapePtr, sx, sy, button->data2Val2, button->data2Val3);
 			} else if (button->data0Val1 == 3) {
 				// nullsub (at least EOBII)
 			} else if (button->data0Val1 == 4) {
@@ -1476,7 +1476,7 @@ void GUI_EoB::processButton(Button *button) {
 		if (button->data0Val1 == 1) {
 			_screen->drawShape(_screen->_curPage, button->data0ShapePtr, fx, fy, sd);
 		} else if (button->data0Val1 == 2) {
-			_screen->printText((const char*) button->data0ShapePtr, sx, sy, button->data0Val2, button->data0Val3);
+			_screen->printText((const char *)button->data0ShapePtr, sx, sy, button->data0Val2, button->data0Val3);
 		} else if (button->data0Val1 == 3) {
 			// nullsub (at least EOBII)
 		} else if (button->data0Val1 == 4) {
@@ -1486,7 +1486,7 @@ void GUI_EoB::processButton(Button *button) {
 			_screen->drawBox(sx, sy, fx2, fy2, button->data0Val2);
 		} else {
 			if (!button->data0Val1) {
-				if(button->data1Val1 == 2 || button->data2Val1 == 2) {
+				if (button->data1Val1 == 2 || button->data2Val1 == 2) {
 					_screen->drawBox(sx, sy, fx2, fy2, button->data0Val2);
 				} else {
 					// nullsub (at least EOBII)
@@ -1542,7 +1542,7 @@ int GUI_EoB::processButtonList(Kyra::Button *buttonList, uint16 inputFlags, int8
 
 			// UNUSED
 			//if (buttonList->flags2 & 0x20) {
-				// if (_processButtonListExtraCallback)
+				//if (_processButtonListExtraCallback)
 				//	this->*_processButtonListExtraCallback(buttonList);
 			//}
 
@@ -2001,7 +2001,7 @@ void GUI_EoB::runCampMenu() {
 	_needRest = false;
 	Button *buttonList = 0;
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		if (newMenu == 2)
 			updateOptionsStrings();
 
@@ -2067,7 +2067,7 @@ void GUI_EoB::runCampMenu() {
 					if (_vm->_menuButtonDefs[s - 1].flags & 2)
 						break;
 					s += dir;
-				} while(!_vm->shouldQuit());
+				} while (!_vm->shouldQuit());
 
 				highlightButton = _vm->gui_getButton(buttonList, s);
 			}
@@ -2219,7 +2219,7 @@ bool GUI_EoB::runLoadMenu(int x, int y) {
 
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		updateSaveSlotsList(_vm->_targetName);
 		int slot = selectSaveSlotDialogue(x, y, 1);
 		if (slot > 5) {
@@ -2257,7 +2257,7 @@ bool GUI_EoB::confirmDialogue2(int dim, int id, int deflt) {
 	for (int i = 0; i < 2; i++)
 		drawMenuButtonBox(x[i], y, 32, 14, false, false);
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		Common::Point p = _vm->getMousePos();
 		if (_vm->posWithinRect(p.x, p.y, x[0], y, x[0] + 32, y + 14))
 			newHighlight = 0;
@@ -2324,7 +2324,7 @@ void GUI_EoB::messageDialogue(int dim, int id, int buttonTextCol) {
 	_screen->printShadedText(_vm->_menuOkString, bx + 4, by + 3, buttonTextCol, 0);
 	_screen->updateScreen();
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
 		_vm->removeInputTop();
 
@@ -2365,7 +2365,7 @@ void GUI_EoB::messageDialogue2(int dim, int id, int buttonTextCol) {
 	_screen->printShadedText(_vm->_menuOkString, x + 4, y + 3, buttonTextCol, 0);
 	_screen->updateScreen();
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
 		_vm->removeInputTop();
 
@@ -2492,7 +2492,7 @@ int GUI_EoB::getTextInput(char *dest, int x, int y, int destMaxLen, int textColo
 		} else if (in > 31 && in < 126) {
 			if (!(in == 32 && pos == 0)) {
 				if (in >= 97 && in <= 122)
-					in -=32;
+					in -= 32;
 
 				if (pos < len) {
 					for (int i = destMaxLen - 1; i >= pos; i--)
@@ -2553,7 +2553,7 @@ Common::String GUI_EoB::transferTargetMenu(Common::Array<Common::String> &target
 		delete[] _savegameList;
 	}
 	_savegameList = new char*[_savegameListSize];
-	memset(_savegameList, 0, _savegameListSize * sizeof(char*));
+	memset(_savegameList, 0, _savegameListSize * sizeof(char *));
 
 	Common::StringArray::iterator ii = targets.begin();
 	for (int i = 0; i < _savegameListSize; ++i) {
@@ -2593,7 +2593,7 @@ Common::String GUI_EoB::transferFileMenu(Common::String &target) {
 		slot = selectSaveSlotDialogue(72, 14, 4);
 		if (slot == 6)
 			break;
-		
+
 		if (_saveSlotIdTemp[slot] == -1)
 			messageDialogue(11, 65, 6);
 		else {
@@ -2638,7 +2638,7 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
 
 	_screen->modifyScreenDim(11, dm->sx + (x >> 3), dm->sy + y, dm->w, dm->h);
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		updateSaveSlotsList(_vm->_targetName);
 		int slot = selectSaveSlotDialogue(x, y, 0);
 		if (slot > 5) {
@@ -2656,7 +2656,7 @@ bool GUI_EoB::runSaveMenu(int x, int y) {
 			int fx = (x + 1) << 3;
 			int fy = y + slot * 17 + 23;
 
-			for (int in = -1; in == -1 && !_vm->shouldQuit(); ) {
+			for (int in = -1; in == -1 && !_vm->shouldQuit();) {
 				_screen->fillRect(fx - 2, fy, fx + 160, fy + 8, _vm->_bkgColor_1);
 				in = getTextInput(_saveSlotStringsTemp[slot], x + 1, fy, 19, 2, 0, 8);
 				if (!strlen(_saveSlotStringsTemp[slot])) {
@@ -2707,7 +2707,7 @@ int GUI_EoB::selectSaveSlotDialogue(int x, int y, int id) {
 	int newHighlight = 0;
 	int slot = -1;
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		int inputFlag = _vm->checkInput(0, false, 0) & 0x8ff;
 		_vm->removeInputTop();
 
@@ -2904,7 +2904,7 @@ void GUI_EoB::runMemorizePrayMenu(int charIndex, int spellType) {
 	bool updateDesc = true;
 	bool updateList = true;
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		updateBoxFrameHighLight(charIndex);
 
 		if (newHighLightButton < 0)
@@ -2964,7 +2964,7 @@ void GUI_EoB::runMemorizePrayMenu(int charIndex, int spellType) {
 		} else {
 			Common::Point p = _vm->getMousePos();
 			if (_vm->posWithinRect(p.x, p.y, 8, 50, 168, 122)) {
-				newHighLightText = (p.y - 50 ) / 9;
+				newHighLightText = (p.y - 50) / 9;
 				if (menuSpellMap[lastHighLightButton * 11] - 1 < newHighLightText)
 					newHighLightText = menuSpellMap[lastHighLightButton * 11] - 1;
 			}
@@ -3257,7 +3257,7 @@ bool GUI_EoB::restParty() {
 
 	restParty_updateRestTime(hours, true);
 
-	for (int l = 0; !res && restLoop && !_vm->shouldQuit(); ) {
+	for (int l = 0; !res && restLoop && !_vm->shouldQuit();) {
 		l++;
 
 		// Regenerate spells
@@ -3321,7 +3321,7 @@ bool GUI_EoB::restParty() {
 				list = 0;
 				if (crs[i] >= 48) {
 					for (int ii = 0; !list && ii < 3; ii++)
-						list = (int8*)memchr(_vm->_characters[i].clericSpells, -spells[ii], 80);
+						list = (int8 *)memchr(_vm->_characters[i].clericSpells, -spells[ii], 80);
 				}
 
 				if (list)
@@ -3380,15 +3380,15 @@ bool GUI_EoB::restParty() {
 				for (int i = 0; i < 6; i++) {
 					// Add Lay On Hands spell
 					if (_vm->_characters[i].cClass == 2) {
-						list = (int8*)memchr(_vm->_characters[i].clericSpells, spells[3], 10);
+						list = (int8 *)memchr(_vm->_characters[i].clericSpells, spells[3], 10);
 						if (list) {
 							*list = spells[3];
 						} else {
-							list = (int8*)memchr(_vm->_characters[i].clericSpells, -spells[3], 10);
+							list = (int8 *)memchr(_vm->_characters[i].clericSpells, -spells[3], 10);
 							if (list) {
 								*list = spells[3];
 							} else if (!memchr(_vm->_characters[i].clericSpells, spells[3], 10)) {
-								list = (int8*)memchr(_vm->_characters[i].clericSpells, 0, 10);
+								list = (int8 *)memchr(_vm->_characters[i].clericSpells, 0, 10);
 								*list = spells[3];
 							}
 						}
@@ -3488,7 +3488,7 @@ bool GUI_EoB::confirmDialogue(int id) {
 	int lastHighlight = -1;
 	bool result = false;
 
-	for (bool runLoop = true; runLoop && !_vm->shouldQuit(); ) {
+	for (bool runLoop = true; runLoop && !_vm->shouldQuit();) {
 		if (newHighlight != lastHighlight) {
 			if (lastHighlight != -1)
 				drawMenuButton(_vm->gui_getButton(buttonList, lastHighlight + 33), false, false, true);
@@ -3701,7 +3701,7 @@ void GUI_EoB::displayTextBox(int id) {
 	_screen->copyRegion(dm->sx << 3, dm->sy, dm->sx << 3, dm->sy, dm->w << 3, dm->h, 2, 0, Screen::CR_NO_P_CHECK);
 	_screen->updateScreen();
 
-	for (uint32 timeOut = _vm->_system->getMillis() + 1440; _vm->_system->getMillis() < timeOut && !_vm->shouldQuit(); ) {
+	for (uint32 timeOut = _vm->_system->getMillis() + 1440; _vm->_system->getMillis() < timeOut && !_vm->shouldQuit();) {
 		int in = _vm->checkInput(0, false, 0);
 		_vm->removeInputTop();
 		if (in && !(in & 0x800))
@@ -3765,7 +3765,7 @@ void GUI_EoB::drawMenuButton(Button *b, bool clicked, bool highlight, bool noFil
 	if (!b)
 		return;
 
-	EoBMenuButtonDef *d = (EoBMenuButtonDef*)b->extButtonDef;
+	EoBMenuButtonDef *d = (EoBMenuButtonDef *)b->extButtonDef;
 
 	if (d->flags & 1)
 		drawMenuButtonBox(b->x, b->y, b->width, b->height, clicked, noFill);
@@ -3827,9 +3827,9 @@ void GUI_EoB::drawSaveSlotButton(int slot, int redrawBox, int textCol) {
 	int x = _saveSlotX + 4;
 	int y = _saveSlotY + slot * 17 + 20;
 	int w = 167;
-	const char *s = (slot < 6) ?_saveSlotStringsTemp[slot] : _vm->_saveLoadStrings[0];
+	const char *s = (slot < 6) ? _saveSlotStringsTemp[slot] : _vm->_saveLoadStrings[0];
 
-	if (slot >= 6 ) {
+	if (slot >= 6) {
 		x = _saveSlotX + 118;
 		y = _saveSlotY + 126;
 		w = 53;
@@ -4034,6 +4034,6 @@ const EoBRect16 GUI_EoB::_updateBoxFrameHighLights[] = {
 	{ 0x00A3, 0x0068, 0x00C3, 0x0089 }
 };
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp
index c58fd0835c..33b47c12e7 100644
--- a/engines/kyra/items_eob.cpp
+++ b/engines/kyra/items_eob.cpp
@@ -107,7 +107,7 @@ Kyra::Item EoBCoreEngine::duplicateItem(Item itemIndex) {
 
 Item EoBCoreEngine::createItemOnCurrentBlock(Item itemIndex) {
 	Item itm = duplicateItem(itemIndex);
-	setItemPosition((Item*)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
+	setItemPosition((Item *)&_levelBlockProperties[_currentBlock].drawObjects, _currentBlock, itm, _dropItemDirIndex[(_currentDirection << 2) + rollDice(1, 2, -1)]);
 	return itm;
 }
 
@@ -182,7 +182,7 @@ void EoBCoreEngine::deleteBlockItem(uint16 block, int type) {
 
 	_levelBlockProperties[block].drawObjects = 0;
 
-	for (uint16 i2 = itm, i = 0; itm != i2 || !i; i++ ) {
+	for (uint16 i2 = itm, i = 0; itm != i2 || !i; i++) {
 		if (type == _items[itm].type || type == -1) {
 			_items[itm].block = -1;
 			_items[itm].level = 0;
@@ -193,7 +193,7 @@ void EoBCoreEngine::deleteBlockItem(uint16 block, int type) {
 			uint16 i3 = itm;
 			itm = _items[itm].prev;
 			_items[i3].prev = _items[i3].next = 0;
-			setItemPosition((Item*)&_levelBlockProperties[block].drawObjects, block, i3, _items[i3].pos);
+			setItemPosition((Item *)&_levelBlockProperties[block].drawObjects, block, i3, _items[i3].pos);
 		}
 	}
 }
@@ -227,7 +227,7 @@ int EoBCoreEngine::validateInventorySlotForItem(Item item, int charIndex, int sl
 int EoBCoreEngine::stripPartyItems(int16 itemType, int16 itemValue, int handleValueMode, int numItems) {
 	int itemsLeft = numItems;
 
-	for (bool runloop = true; runloop && itemsLeft; ) {
+	for (bool runloop = true; runloop && itemsLeft;) {
 		runloop = false;
 		for (int i = 0; i < 6 && itemsLeft; i++) {
 			if (!testCharacter(i, 1))
@@ -371,58 +371,58 @@ void EoBCoreEngine::printFullItemName(Item item) {
 
 	if ((itm->flags & 0x40) && !strlen(nameId)) {
 		switch (f) {
-			case 0:
-			case 1:
-			case 2:
-			case 3:
-				if (v == 0)
-					tmpString = nameUnid;
-				else if (v < 0)
-					tmpString = _flags.gameID == GI_EOB1 ? Common::String::format(_cursedString[0], nameUnid, v) : Common::String::format(_cursedString[0], v, nameUnid);
-				else
-					tmpString = _flags.gameID == GI_EOB1 ? Common::String::format(_enchantedString[0], nameUnid, v) : Common::String::format(_enchantedString[0], v, nameUnid);
-				break;
+		case 0:
+		case 1:
+		case 2:
+		case 3:
+			if (v == 0)
+				tmpString = nameUnid;
+			else if (v < 0)
+				tmpString = _flags.gameID == GI_EOB1 ? Common::String::format(_cursedString[0], nameUnid, v) : Common::String::format(_cursedString[0], v, nameUnid);
+			else
+				tmpString = _flags.gameID == GI_EOB1 ? Common::String::format(_enchantedString[0], nameUnid, v) : Common::String::format(_enchantedString[0], v, nameUnid);
+			break;
 
-			case 9:
-				tstr2 = _magicObjectStrings[0];
-				tstr3 = _spells[v].name;
-				correctSuffixCase = true;
-				break;
+		case 9:
+			tstr2 = _magicObjectStrings[0];
+			tstr3 = _spells[v].name;
+			correctSuffixCase = true;
+			break;
+
+		case 10:
+			tstr2 = _magicObjectStrings[1];
+			tstr3 = _spells[_flags.gameID == GI_EOB1 ? (_clericSpellOffset + v) : v].name;
+			correctSuffixCase = true;
+			break;
+
+		case 14:
+			tstr2 = _magicObjectStrings[3];
+			if (_flags.gameID == GI_EOB1)
+				v--;
+			tstr3 = _suffixStringsPotions[v];
+			break;
+
+		case 16:
+			tstr2 = _magicObjectStrings[2];
+			tstr3 = _suffixStringsRings[v];
+			break;
 
-			case 10:
-				tstr2 = _magicObjectStrings[1];
-				tstr3 = _spells[_flags.gameID == GI_EOB1 ? (_clericSpellOffset + v) : v].name;
+		case 18:
+			if (_flags.gameID == GI_EOB2 && v == 5) {
+				if (_flags.lang == Common::DE_DEU)
+					tstr2 = _magicObjectString5[0];
+				else
+					tstr3 = _magicObjectString5[0];
 				correctSuffixCase = true;
-				break;
-
-			case 14:
-				tstr2 = _magicObjectStrings[3];
-				if (_flags.gameID == GI_EOB1)
-					v--;
-				tstr3 = _suffixStringsPotions[v];
-				break;
-
-			case 16:
-				tstr2 = _magicObjectStrings[2];
-				tstr3 = _suffixStringsRings[v];
-				break;
-
-			case 18:
-				if (_flags.gameID == GI_EOB2 && v == 5) {
-					if (_flags.lang == Common::DE_DEU)
-						tstr2 = _magicObjectString5[0];
-					else
-						tstr3 = _magicObjectString5[0];
-					correctSuffixCase = true;
-				} else {
-					tstr2 = _magicObjectStrings[4];
-				}
-				tstr3 = _suffixStringsWands[v];
-				break;
+			} else {
+				tstr2 = _magicObjectStrings[4];
+			}
+			tstr3 = _suffixStringsWands[v];
+			break;
 
-			default:
-				tmpString = nameUnid;
-				break;
+		default:
+			tmpString = nameUnid;
+			break;
 		}
 
 
@@ -528,7 +528,7 @@ bool EoBCoreEngine::launchObject(int charIndex, Item item, uint16 startBlock, in
 	if (slot == 10)
 		return false;
 
-	setItemPosition((Item*)&_levelBlockProperties[startBlock].drawObjects, startBlock, item, startPos | 4);
+	setItemPosition((Item *)&_levelBlockProperties[startBlock].drawObjects, startBlock, item, startPos | 4);
 
 	t->enable = 1;
 	t->u2 = 1;
@@ -577,8 +577,8 @@ bool EoBCoreEngine::updateObjectFlight(EoBFlyingObject *fo, int block, int pos)
 	uint8 wallFlags = _wllWallFlags[_levelBlockProperties[block].walls[fo->direction ^ 2]];
 	if (fo->enable == 1) {
 		if ((wallFlags & 1) || (fo->u2) || ((wallFlags & 2) && (_dscItemShapeMap[_items[fo->item].icon] >= 15))) {
-			getQueuedItem((Item*)&_levelBlockProperties[fo->curBlock].drawObjects, 0, fo->item);
-			setItemPosition((Item*)&_levelBlockProperties[block].drawObjects, block, fo->item, pos | 4);
+			getQueuedItem((Item *)&_levelBlockProperties[fo->curBlock].drawObjects, 0, fo->item);
+			setItemPosition((Item *)&_levelBlockProperties[block].drawObjects, block, fo->item, pos | 4);
 			fo->curBlock = block;
 			fo->curPos = pos;
 			fo->distance--;
diff --git a/engines/kyra/magic_eob.cpp b/engines/kyra/magic_eob.cpp
index c1b0327df2..1c29206982 100644
--- a/engines/kyra/magic_eob.cpp
+++ b/engines/kyra/magic_eob.cpp
@@ -40,7 +40,7 @@ void EoBCoreEngine::useMagicBookOrSymbol(int charIndex, int type) {
 	int8 *tmp = _openBookAvailableSpells + _openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem;
 
 	if (*tmp <= 0) {
-		for (bool loop = true; loop && _openBookSpellSelectedItem < 10; ) {
+		for (bool loop = true; loop && _openBookSpellSelectedItem < 10;) {
 			tmp = _openBookAvailableSpells + _openBookSpellLevel * 10 + _openBookSpellListOffset + _openBookSpellSelectedItem;
 			if (*tmp > 0) {
 				if (_openBookSpellSelectedItem > 5) {
@@ -448,7 +448,7 @@ void EoBCoreEngine::sparkEffectOffensive() {
 }
 
 void EoBCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timerLength, int timerLevelFactor, int updateExistingTimer) {
-	assert (spell >= 0);
+	assert(spell >= 0);
 	int l = _openBookType == 1 ? getClericPaladinLevel(_openBookChar) : getMageLevel(_openBookChar);
 	uint32 countdown = timerLength * timerBaseFactor + timerLength * l * timerLevelFactor;
 	setCharEventTimer(_activeSpellCharId, countdown, -spell, updateExistingTimer);
@@ -457,7 +457,7 @@ void EoBCoreEngine::setSpellEventTimer(int spell, int timerBaseFactor, int timer
 void EoBCoreEngine::sortCharacterSpellList(int charIndex) {
 	int8 *list = _characters[charIndex].mageSpells;
 
-	for (int i = 0; i < 16; ) {
+	for (int i = 0; i < 16;) {
 		bool p = false;
 		for (int ii = 0; ii < 9; ii++) {
 			int8 *pos = &list[ii];
@@ -758,7 +758,7 @@ int EoBCoreEngine::findFirstCharacterSpellTarget() {
 }
 
 int EoBCoreEngine::findNextCharacterSpellTarget(int curCharIndex) {
-	for (_characterSpellTarget++; _characterSpellTarget < 6; ) {
+	for (_characterSpellTarget++; _characterSpellTarget < 6;) {
 		if (++curCharIndex == 6)
 			curCharIndex = 0;
 		if (testCharacter(curCharIndex, 3))
@@ -826,7 +826,7 @@ void EoBCoreEngine::spellCallback_start_detectMagic() {
 	setHandItem(_itemInHand);
 }
 
-bool EoBCoreEngine::spellCallback_end_detectMagic(void*) {
+bool EoBCoreEngine::spellCallback_end_detectMagic(void *) {
 	setHandItem(_itemInHand);
 	return true;
 }
@@ -836,7 +836,7 @@ void EoBCoreEngine::spellCallback_start_magicMissile() {
 }
 
 bool EoBCoreEngine::spellCallback_end_magicMissile(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 1, 4, 1, (getMageLevel(fo->attackerId) - 1) >> 1);
 }
 
@@ -855,7 +855,7 @@ void EoBCoreEngine::spellCallback_start_shockingGrasp() {
 }
 
 bool EoBCoreEngine::spellCallback_end_shockingGraspFlameBlade(void *obj) {
-	EoBCharacter *c = (EoBCharacter*)obj;
+	EoBCharacter *c = (EoBCharacter *)obj;
 	for (int i = 0; i < 2; i++) {
 		if (isMagicEffectItem(c->inventory[i])) {
 			removeMagicWeaponItem(c->inventory[i]);
@@ -878,7 +878,7 @@ void EoBCoreEngine::spellCallback_start_melfsAcidArrow() {
 }
 
 bool EoBCoreEngine::spellCallback_end_melfsAcidArrow(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	assert(fo);
 	return magicObjectDamageHit(fo, 2, 4, 0, getMageLevel(fo->attackerId) / 3);
 }
@@ -895,7 +895,7 @@ void EoBCoreEngine::spellCallback_start_fireball() {
 }
 
 bool EoBCoreEngine::spellCallback_end_fireball(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 }
 
@@ -904,7 +904,7 @@ void EoBCoreEngine::spellCallback_start_flameArrow() {
 }
 
 bool EoBCoreEngine::spellCallback_end_flameArrow(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 5, 6, 0, getMageLevel(fo->attackerId));
 }
 
@@ -913,7 +913,7 @@ void EoBCoreEngine::spellCallback_start_holdPerson() {
 }
 
 bool EoBCoreEngine::spellCallback_end_holdPerson(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	bool res = false;
 
 	if (_flags.gameID == GI_EOB2 && fo->curBlock == _currentBlock) {
@@ -943,7 +943,7 @@ void EoBCoreEngine::spellCallback_start_lightningBolt() {
 }
 
 bool EoBCoreEngine::spellCallback_end_lightningBolt(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 }
 
@@ -962,7 +962,7 @@ void EoBCoreEngine::spellCallback_start_vampiricTouch() {
 }
 
 bool EoBCoreEngine::spellCallback_end_vampiricTouch(void *obj) {
-	EoBCharacter *c = (EoBCharacter*)obj;
+	EoBCharacter *c = (EoBCharacter *)obj;
 	if (c->hitPointsCur > c->hitPointsMax)
 		c->hitPointsCur = c->hitPointsMax;
 	spellCallback_end_shockingGraspFlameBlade(obj);
@@ -983,7 +983,7 @@ void EoBCoreEngine::spellCallback_start_iceStorm() {
 }
 
 bool EoBCoreEngine::spellCallback_end_iceStorm(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	static int8 blockAdv[] = { -32, 32, 1, -1 };
 	bool res = magicObjectDamageHit(fo, 1, 6, 0, getMageLevel(fo->attackerId));
 	if (res) {
@@ -1039,7 +1039,7 @@ void EoBCoreEngine::spellCallback_start_holdMonster() {
 }
 
 bool EoBCoreEngine::spellCallback_end_holdMonster(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	bool res = false;
 	for (const int16 *m = findBlockMonsters(fo->curBlock, fo->curPos, fo->direction, 1, 1); *m != -1; m++)
 		res |= magicObjectStatusHit(&_monsters[*m], 1, true, 4);
@@ -1104,7 +1104,7 @@ void EoBCoreEngine::spellCallback_start_trueSeeing() {
 	_wllVmpMap[46] = 0;
 }
 
-bool EoBCoreEngine::spellCallback_end_trueSeeing(void*) {
+bool EoBCoreEngine::spellCallback_end_trueSeeing(void *) {
 	_wllVmpMap[46] = 1;
 	return true;
 }
@@ -1150,7 +1150,7 @@ void EoBCoreEngine::spellCallback_start_aid() {
 }
 
 bool EoBCoreEngine::spellCallback_end_aid(void *obj) {
-	EoBCharacter *c = (EoBCharacter*)obj;
+	EoBCharacter *c = (EoBCharacter *)obj;
 	c->hitPointsCur -= c->effectsRemainder[3];
 	c->effectsRemainder[3] = 0;
 	c->effectFlags &= ~0x1000;
@@ -1181,7 +1181,7 @@ void EoBCoreEngine::spellCallback_start_slowPoison() {
 }
 
 bool EoBCoreEngine::spellCallback_end_slowPoison(void *obj) {
-	EoBCharacter *c = (EoBCharacter*)obj;
+	EoBCharacter *c = (EoBCharacter *)obj;
 	c->effectFlags &= ~0x2000;
 	return true;
 }
@@ -1232,7 +1232,7 @@ void EoBCoreEngine::spellCallback_start_flameStrike() {
 }
 
 bool EoBCoreEngine::spellCallback_end_flameStrike(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 6, 8, 0, 0);
 }
 
@@ -1288,12 +1288,12 @@ void EoBCoreEngine::spellCallback_start_turnUndead() {
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_lightningBolt(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 0, 0, 12, 1);
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_fireball1(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	bool res = false;
 	if (_partyEffectFlags & 0x20000) {
 		res = magicObjectDamageHit(fo, 4, 10, 6, 0);
@@ -1308,12 +1308,12 @@ bool EoBCoreEngine::spellCallback_end_monster_fireball1(void *obj) {
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_fireball2(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	return magicObjectDamageHit(fo, 0, 0, 18, 0);
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_deathSpell(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
@@ -1330,7 +1330,7 @@ bool EoBCoreEngine::spellCallback_end_monster_deathSpell(void *obj) {
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_disintegrate(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
@@ -1346,7 +1346,7 @@ bool EoBCoreEngine::spellCallback_end_monster_disintegrate(void *obj) {
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_causeCriticalWounds(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
@@ -1360,7 +1360,7 @@ bool EoBCoreEngine::spellCallback_end_monster_causeCriticalWounds(void *obj) {
 }
 
 bool EoBCoreEngine::spellCallback_end_monster_fleshToStone(void *obj) {
-	EoBFlyingObject *fo = (EoBFlyingObject*)obj;
+	EoBFlyingObject *fo = (EoBFlyingObject *)obj;
 	if (fo->curBlock != _currentBlock)
 		return false;
 
@@ -1377,6 +1377,6 @@ bool EoBCoreEngine::spellCallback_end_monster_fleshToStone(void *obj) {
 	return true;
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/saveload_eob.cpp b/engines/kyra/saveload_eob.cpp
index 1f982aa3ab..ef5e8dc7a4 100644
--- a/engines/kyra/saveload_eob.cpp
+++ b/engines/kyra/saveload_eob.cpp
@@ -451,9 +451,9 @@ Common::Error EoBCoreEngine::saveGameStateIntern(int slot, const char *saveName,
 		for (int ii = 0; ii < 1024; ii++)
 			out->writeByte(l->flags[ii] & 0xff);
 
-		EoBMonsterInPlay *lm = (EoBMonsterInPlay*)_lvlTempData[i]->monsters;
-		EoBFlyingObject *lf = (EoBFlyingObject*)_lvlTempData[i]->flyingObjects;
-		WallOfForce *lw = (WallOfForce*)_lvlTempData[i]->wallsOfForce;
+		EoBMonsterInPlay *lm = (EoBMonsterInPlay *)_lvlTempData[i]->monsters;
+		EoBFlyingObject *lf = (EoBFlyingObject *)_lvlTempData[i]->flyingObjects;
+		WallOfForce *lw = (WallOfForce *)_lvlTempData[i]->wallsOfForce;
 
 		for (int ii = 0; ii < 30; ii++) {
 			EoBMonsterInPlay *m = &lm[ii];
@@ -535,7 +535,7 @@ void EoBCoreEngine::restoreMonsterTempData(LevelTempData *tmp) {
 }
 
 void EoBCoreEngine::releaseMonsterTempData(LevelTempData *tmp) {
-	EoBMonsterInPlay *p = (EoBMonsterInPlay*)tmp->monsters;
+	EoBMonsterInPlay *p = (EoBMonsterInPlay *)tmp->monsters;
 	delete[] p;
 }
 
@@ -556,10 +556,10 @@ void EoBCoreEngine::restoreWallOfForceTempData(LevelTempData *tmp) {
 }
 
 void EoBCoreEngine::releaseWallOfForceTempData(LevelTempData *tmp) {
-	WallOfForce *p = (WallOfForce*)tmp->wallsOfForce;
+	WallOfForce *p = (WallOfForce *)tmp->wallsOfForce;
 	delete[] p;
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/scene_eob.cpp b/engines/kyra/scene_eob.cpp
index b44feaf013..982191b359 100644
--- a/engines/kyra/scene_eob.cpp
+++ b/engines/kyra/scene_eob.cpp
@@ -121,7 +121,7 @@ void EoBCoreEngine::loadLevel(int level, int sub) {
 	_screen->setCurPage(0);
 }
 
-Common::String EoBCoreEngine::initLevelData(int sub){
+Common::String EoBCoreEngine::initLevelData(int sub) {
 	const uint8 *data = _screen->getCPagePtr(5) + 2;
 	const uint8 *pos = data;
 
@@ -135,10 +135,10 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 		if (_flags.gameID == GI_EOB1)
 			pos -= 3;
 
-		loadBlockProperties((const char*)pos);
+		loadBlockProperties((const char *)pos);
 		pos += slen;
 
-		Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("%s.VMP", (const char*)pos));
+		Common::SeekableReadStream *s = _res->createReadStream(Common::String::format("%s.VMP", (const char *)pos));
 		uint16 size = s->readUint16LE();
 		delete[] _vmpPtr;
 		_vmpPtr = new uint16[size];
@@ -146,12 +146,12 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 			_vmpPtr[i] = s->readUint16LE();
 		delete s;
 
-		Common::String tmpStr = Common::String::format("%s.PAL", (const char*) pos);
-		_curGfxFile = (const char*) pos;
+		Common::String tmpStr = Common::String::format("%s.PAL", (const char *)pos);
+		_curGfxFile = (const char *)pos;
 		pos += slen;
 
 		if (*pos++ != 0xff && _flags.gameID == GI_EOB2) {
-			tmpStr = Common::String::format("%s.PAL", (const char*) pos);
+			tmpStr = Common::String::format("%s.PAL", (const char *)pos);
 			pos += 13;
 		}
 
@@ -168,19 +168,19 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 		_screen->getPalette(0).fill(224, 32, 0x3f);
 		uint8 *src = _screen->getPalette(0).getData();
 
-		_screen->createFadeTable(src, _screen->getFadeTable(0), 4, 75);		// green
-		_screen->createFadeTable(src, _screen->getFadeTable(1), 12, 200);	// black
-		_screen->createFadeTable(src, _screen->getFadeTable(2), 10, 85);	// blue
-		_screen->createFadeTable(src, _screen->getFadeTable(3), 11, 125);	// light blue
+		_screen->createFadeTable(src, _screen->getFadeTable(0), 4, 75);     // green
+		_screen->createFadeTable(src, _screen->getFadeTable(1), 12, 200);   // black
+		_screen->createFadeTable(src, _screen->getFadeTable(2), 10, 85);    // blue
+		_screen->createFadeTable(src, _screen->getFadeTable(3), 11, 125);   // light blue
 
 		_screen->getPalette(0).copy(backupPal, 224, 32, 224);
-		_screen->createFadeTable(src, _screen->getFadeTable(4), 12, 85);	// grey (shadow)
+		_screen->createFadeTable(src, _screen->getFadeTable(4), 12, 85);    // grey (shadow)
 		_screen->setFadeTableIndex(4);
 	}
 
 	if (_flags.gameID == GI_EOB2) {
 		delay(3 * _tickLength);
-		_sound->loadSoundFile((const char*) pos);
+		_sound->loadSoundFile((const char *)pos);
 		pos += 13;
 	}
 
@@ -195,7 +195,7 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 		_scriptTimers[0].ticks = READ_LE_UINT16(pos);
 		_scriptTimers[0].func = 0;
 		_scriptTimers[0].next = _system->getMillis() + _scriptTimers[0].ticks * _tickLength;
-		pos+= 2;
+		pos += 2;
 	} else {
 		for (int i = 0; i < 2; i++) {
 			int a = (*pos == 0xEC) ? 0 : ((*pos == 0xEA) ? 1 : -1);
@@ -205,12 +205,12 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 			toggleWallState(pos[13], a);
 			_doorType[pos[13]] = pos[14];
 			_noDoorSwitch[pos[13]] = pos[15];
-			pos = loadDoorShapes((const char*)pos, pos[13], pos + 16);
+			pos = loadDoorShapes((const char *)pos, pos[13], pos + 16);
 		}
 	}
 
 	_stepsUntilScriptCall = READ_LE_UINT16(pos);
-	pos+= 2;
+	pos += 2;
 	_stepCounter = 0;
 
 	for (int i = 0; i < 2; i++) {
@@ -237,7 +237,7 @@ Common::String EoBCoreEngine::initLevelData(int sub){
 
 		for (int i = 0; i < num; i++) {
 			if (*pos++ == 0xEC) {
-				loadDecorations((const char*)pos, (const char*)(pos + slen));
+				loadDecorations((const char *)pos, (const char *)(pos + slen));
 				pos += (slen << 1);
 			} else {
 				assignWallsAndDecorations(pos[0], pos[1], (int8)pos[2], pos[3], pos[4]);
@@ -259,7 +259,7 @@ void EoBCoreEngine::addLevelItems() {
 	for (int i = 0; i < 600; i++) {
 		if (_items[i].level != _currentLevel || _items[i].block <= 0)
 			continue;
-		setItemPosition((Item*)&_levelBlockProperties[_items[i].block & 0x3ff].drawObjects, _items[i].block, i, _items[i].pos);
+		setItemPosition((Item *)&_levelBlockProperties[_items[i].block & 0x3ff].drawObjects, _items[i].block, i, _items[i].pos);
 	}
 }
 
@@ -647,13 +647,13 @@ int EoBCoreEngine::clickedNiche(uint16 block, uint16 direction) {
 		if (_dscItemShapeMap[_items[_itemInHand].icon] <= 14) {
 			_txt->printMessage(_pryDoorStrings[5]);
 		} else {
-			setItemPosition((Item*)&_levelBlockProperties[block & 0x3ff].drawObjects, block, _itemInHand, 8);
+			setItemPosition((Item *)&_levelBlockProperties[block & 0x3ff].drawObjects, block, _itemInHand, 8);
 			runLevelScript(block, 4);
 			setHandItem(0);
 			_sceneUpdateRequired = true;
 		}
 	} else {
-		int d = getQueuedItem((Item*)&_levelBlockProperties[block].drawObjects, 8, -1);
+		int d = getQueuedItem((Item *)&_levelBlockProperties[block].drawObjects, 8, -1);
 		if (!d)
 			return 1;
 		runLevelScript(block, 8);
@@ -693,7 +693,7 @@ int EoBCoreEngine::clickedDoorPry(uint16 block, uint16 direction) {
 	if (rollDice(1, 20) < forceDoorChanceTable[s]) {
 		_txt->printMessage(_pryDoorStrings[_flags.gameID == GI_EOB2 ? 2 : 1]);
 		_levelBlockProperties[block].walls[direction] = _levelBlockProperties[block].walls[direction ^ 2] =
-			(_levelBlockProperties[block].walls[direction] == (_flags.gameID == GI_EOB2 ? 51 : 30)) ? 8 : 18;
+		            (_levelBlockProperties[block].walls[direction] == (_flags.gameID == GI_EOB2 ? 51 : 30)) ? 8 : 18;
 		openDoor(block);
 	} else {
 		_txt->printMessage(_pryDoorStrings[3]);
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 7061ada4ac..6b1128bdfd 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -198,7 +198,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 		shapesize += 4;
 
 		shp = new uint8[shapesize];
-		memset (shp, 0, shapesize);
+		memset(shp, 0, shapesize);
 		uint8 *dst = shp;
 
 		*dst++ = 0;
@@ -239,18 +239,18 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 	} else {
 		uint8 nib = 0, col = 0;
 		uint8 *colorMap = new uint8[0x100];
-		memset (colorMap, 0xff, 0x100);
+		memset(colorMap, 0xff, 0x100);
 
 		shapesize = h * (w << 2) + 20;
 		shp = new uint8[shapesize];
-		memset (shp, 0, shapesize);
+		memset(shp, 0, shapesize);
 		uint8 *dst = shp;
 
 		*dst++ = 1;
 		*dst++ = (h & 0xff);
 		*dst++ = (w & 0xff);
 		*dst++ = (h & 0xff);
-		memset (dst, 0xff, 0x10);
+		memset(dst, 0xff, 0x10);
 
 		uint8 *pal = dst;
 		dst += 0x10;
@@ -276,7 +276,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
 					}
 				}
 
-				if(++nib & 1) {
+				if (++nib & 1) {
 					*dst = c << 4;
 				} else {
 					*dst++ |= c;
@@ -300,7 +300,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 
 	va_list args;
 	va_start(args, flags);
-	uint8 *ovl = (flags & 2) ? va_arg(args, uint8*) : 0;
+	uint8 *ovl = (flags & 2) ? va_arg(args, uint8 *) : 0;
 	va_end(args);
 
 	if (sd != -1) {
@@ -340,7 +340,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 				return;
 			src += (d * (width >> 1));
 			d = dY + dH - _dsY1;
-			if (d >=0) {
+			if (d >= 0) {
 				dH = d;
 				dY = _dsY1;
 				d = _dsY2 - dY;
@@ -355,7 +355,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 		if (d < dH)
 			dH = d;
 
-        int16 cnt1 = 0;
+		int16 cnt1 = 0;
 		int16 cnt2 = 0;
 		int16 dXbit1 = dX & 1;
 
@@ -488,7 +488,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 						marginLeft = marginLeft + 1 - *src++;
 				}
 			}
-            dY = _dsY1;
+			dY = _dsY1;
 		}
 
 		d = _dsY2 - dY;
@@ -523,7 +523,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
 		}
 
 		dst += (dY * 320 + dX);
-		uint8 * dstL = dst;
+		uint8 *dstL = dst;
 
 		if (pageNum == 0 || pageNum == 1)
 			addDirtyRect(rX, rY, rW, rH);
@@ -664,7 +664,7 @@ const uint8 *Screen_EoB::scaleShapeStep(const uint8 *shp) {
 		shp += w2;
 	}
 
-	return (const uint8 *) _dsTempPage;
+	return (const uint8 *)_dsTempPage;
 }
 
 void Screen_EoB::replaceShapePalette(uint8 *shp, const uint8 *pal) {
@@ -690,7 +690,7 @@ void Screen_EoB::setShapeFrame(int x1, int y1, int x2, int y2) {
 	_dsY2 = y2;
 }
 
-void Screen_EoB::setShapeFadeMode (uint8 i, bool b) {
+void Screen_EoB::setShapeFadeMode(uint8 i, bool b) {
 	if (!i || i == 1)
 		_shapeFadeMode[i] = b;
 }
@@ -721,13 +721,13 @@ void Screen_EoB::drawExplosion(int scale, int radius, int numElements, int stepS
 	int16 gx2 = _gfxX;
 	int16 gy2 = _gfxY;
 
-	int16 *ptr2 = (int16*)_dsTempPage;
-	int16 *ptr3 = (int16*)&_dsTempPage[300];
-	int16 *ptr4 = (int16*)&_dsTempPage[600];
-	int16 *ptr5 = (int16*)&_dsTempPage[900];
-	int16 *ptr6 = (int16*)&_dsTempPage[1200];
-	int16 *ptr7 = (int16*)&_dsTempPage[1500];
-	int16 *ptr8 = (int16*)&_dsTempPage[1800];
+	int16 *ptr2 = (int16 *)_dsTempPage;
+	int16 *ptr3 = (int16 *)&_dsTempPage[300];
+	int16 *ptr4 = (int16 *)&_dsTempPage[600];
+	int16 *ptr5 = (int16 *)&_dsTempPage[900];
+	int16 *ptr6 = (int16 *)&_dsTempPage[1200];
+	int16 *ptr7 = (int16 *)&_dsTempPage[1500];
+	int16 *ptr8 = (int16 *)&_dsTempPage[1800];
 
 	if (numElements > 150)
 		numElements = 150;
@@ -804,14 +804,14 @@ void Screen_EoB::drawExplosion(int scale, int radius, int numElements, int stepS
 }
 
 void Screen_EoB::drawVortex(int numElements, int radius, int stepSize, int, int disorder, const uint8 *colorTable, int colorTableSize) {
-	int16 *xCoords = (int16*)_dsTempPage;
-	int16 *yCoords = (int16*)&_dsTempPage[300];
-	int16 *xMod = (int16*)&_dsTempPage[600];
-	int16 *yMod = (int16*)&_dsTempPage[900];
-	int16 *pixBackup = (int16*)&_dsTempPage[1200];
-	int16 *colTableStep = (int16*)&_dsTempPage[1500];
-	int16 *colTableIndex = (int16*)&_dsTempPage[1800];
-	int16 *pixDelay = (int16*)&_dsTempPage[2100];
+	int16 *xCoords = (int16 *)_dsTempPage;
+	int16 *yCoords = (int16 *)&_dsTempPage[300];
+	int16 *xMod = (int16 *)&_dsTempPage[600];
+	int16 *yMod = (int16 *)&_dsTempPage[900];
+	int16 *pixBackup = (int16 *)&_dsTempPage[1200];
+	int16 *colTableStep = (int16 *)&_dsTempPage[1500];
+	int16 *colTableIndex = (int16 *)&_dsTempPage[1800];
+	int16 *pixDelay = (int16 *)&_dsTempPage[2100];
 
 	hideMouse();
 	int cp = _curPage;
@@ -873,7 +873,7 @@ void Screen_EoB::drawVortex(int numElements, int radius, int stepSize, int, int
 	}
 
 	int d = 0;
-	for (int i = 2; i; ) {
+	for (int i = 2; i;) {
 		if (i != 2) {
 			for (int ii = numElements - 1; ii >= 0; ii--) {
 				int16 px = CLIP((xCoords[ii] >> 6) + cx, 0, SCREEN_W - 1);
@@ -911,7 +911,7 @@ void Screen_EoB::drawVortex(int numElements, int radius, int stepSize, int, int
 			int16 px = CLIP((xCoords[ii] >> 6) + cx, 0, SCREEN_W - 1);
 			int16 py = CLIP((yCoords[ii] >> 6) + cy, 0, SCREEN_H - 1);
 
-			uint8 tc1 =  ((disorder >> 2) <= d) ? getPagePixel(2, px, py) : 0;
+			uint8 tc1 = ((disorder >> 2) <= d) ? getPagePixel(2, px, py) : 0;
 			pixBackup[ii] = getPagePixel(0, px, py);
 			uint8 tblIndex = CLIP(colTableIndex[ii] >> 8, 0, colorTableSize - 1);
 			uint8 tc2 = colorTable[tblIndex];
@@ -942,7 +942,7 @@ void Screen_EoB::drawVortex(int numElements, int radius, int stepSize, int, int
 void Screen_EoB::fadeTextColor(Palette *pal, int color1, int rate) {
 	uint8 *col = pal->getData();
 
-	for (bool loop = true; loop; ) {
+	for (bool loop = true; loop;) {
 		loop = true;
 		uint32 end = _system->getMillis() + _vm->tickLength();
 
@@ -1027,7 +1027,7 @@ void Screen_EoB::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, ui
 		tmp = (uint16)((*src - b) * weight) << 1;
 		tb = *src++ - ((tmp >> 8) & 0xff);
 
-		uint8 * d = palData + 3;
+		uint8 *d = palData + 3;
 		uint16 v = 0xffff;
 		uint8 col = rootColor;
 
@@ -1044,7 +1044,7 @@ void Screen_EoB::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, ui
 				col = ii ;
 			}
 		}
-        *dst++ = col;
+		*dst++ = col;
 	}
 }
 
@@ -1052,13 +1052,13 @@ uint8 *Screen_EoB::getFadeTable(int index) {
 	return (index >= 0 && index < 5) ? &_fadeData[index << 8] : 0;
 }
 
-void Screen_EoB::drawShapeSetPixel(uint8 * dst, uint8 c) {
+void Screen_EoB::drawShapeSetPixel(uint8 *dst, uint8 c) {
 	if (_shapeFadeMode[0]) {
 		if (_shapeFadeMode[1]) {
 			c = *dst;
 		} else {
 			_shapeFadeInternal &= 7;
-            c = *(dst + _shapeFadeInternal++);
+			c = *(dst + _shapeFadeInternal++);
 		}
 	}
 
@@ -1134,7 +1134,7 @@ int OldDOSFont::getCharWidth(uint16 c) const {
 }
 
 void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
-	static const uint8 renderMaskTable6[] = { 0xFC, 0x00, 0x7E, 0x00, 0x3F, 0x00, 0x1F, 0x80, 0x0F, 0xC0, 0x07, 0xE0, 0x03, 0xF0, 0x01, 0xF8	};
+	static const uint8 renderMaskTable6[] = { 0xFC, 0x00, 0x7E, 0x00, 0x3F, 0x00, 0x1F, 0x80, 0x0F, 0xC0, 0x07, 0xE0, 0x03, 0xF0, 0x01, 0xF8 };
 	static const uint8 renderMaskTable8[] = { 0xFF, 0x00, 0x7F, 0x80, 0x3F, 0xC0, 0x1F, 0xE0, 0x0F, 0xF0, 0x07, 0xF8, 0x03, 0xFC, 0x01, 0xFE };
 
 	if (_width != 8 && _width != 6)
@@ -1157,7 +1157,7 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 			// TODO: recheck this: no conversion for 'ß' ?
 			break;
 		}
-	} else if (_width == 8){
+	} else if (_width == 8) {
 		switch (c) {
 		case 0x81:
 		case 0x9a:
@@ -1197,7 +1197,7 @@ void OldDOSFont::drawChar(uint16 c, byte *dst, int pitch) const {
 		int cW = w;
 		const uint8 *mtbl = _width == 8 ? renderMaskTable8 : renderMaskTable6;
 
-		for (bool runWidthLoop = true; runWidthLoop; ) {
+		for (bool runWidthLoop = true; runWidthLoop;) {
 			uint8 s = *src++;
 			uint8 m = *mtbl++;
 
@@ -1233,6 +1233,6 @@ void OldDOSFont::unload() {
 	_bitmapOffsets = 0;
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/script_eob.cpp b/engines/kyra/script_eob.cpp
index ab22b4f0b6..e5f26be210 100644
--- a/engines/kyra/script_eob.cpp
+++ b/engines/kyra/script_eob.cpp
@@ -136,7 +136,7 @@ EoBInfProcessor::EoBInfProcessor(EoBCoreEngine *engine, Screen_EoB *screen) : _v
 	_lastScriptFlags = 0;
 
 	_subroutineStack = new int8*[10];
-	memset(_subroutineStack, 0, 10 * sizeof(int8*));
+	memset(_subroutineStack, 0, 10 * sizeof(int8 *));
 	_subroutineStackPos = 0;
 
 	_flagTable = new uint32[18];
@@ -157,8 +157,8 @@ EoBInfProcessor::~EoBInfProcessor() {
 	delete[] _flagTable;
 	delete[] _stack;
 	delete[] _scriptData;
-	for (Common::Array<const InfOpcode*>::const_iterator a = _opcodes.begin(); a != _opcodes.end(); ++a) {
-		delete (*a)->proc;
+	for (Common::Array<const InfOpcode *>::const_iterator a = _opcodes.begin(); a != _opcodes.end(); ++a) {
+		delete(*a)->proc;
 		delete *a;
 	}
 	_opcodes.clear();
@@ -190,7 +190,7 @@ void EoBInfProcessor::run(int func, int flags) {
 	_lastScriptFunc = func;
 	_lastScriptFlags = flags;
 
-	int8 *pos = (int8*)(_scriptData + o);
+	int8 *pos = (int8 *)(_scriptData + o);
 
 	do {
 		int8 cmd = *pos++;
@@ -236,12 +236,12 @@ const char *EoBInfProcessor::getString(uint16 index) {
 	int8 *res = _scriptData + READ_LE_UINT16(_scriptData);
 
 	while (index) {
-		if(*res++)
+		if (*res++)
 			continue;
 		index--;
 	}
 
-	return (const char*)res;
+	return (const char *)res;
 }
 
 int EoBInfProcessor::oeob_setWallType(int8 *data) {
@@ -418,9 +418,9 @@ int EoBInfProcessor::oeob_movePartyOrObject(int8 *data) {
 			int i = _vm->countQueuedItems(_vm->_levelBlockProperties[c].drawObjects, -1, (int16)b, 0, 1);
 			while (i) {
 				int p = _vm->_items[i].pos;
-				_vm->getQueuedItem((Item*)&_vm->_levelBlockProperties[c].drawObjects, 0, i);
+				_vm->getQueuedItem((Item *)&_vm->_levelBlockProperties[c].drawObjects, 0, i);
 				if (_vm->_currentLevel == f) {
-					_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[d].drawObjects, d, i, p);
+					_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[d].drawObjects, d, i, p);
 				} else {
 					_vm->_items[i].level = f;
 					_vm->_items[i].block = d;
@@ -494,7 +494,7 @@ int EoBInfProcessor::oeob_moveInventoryItemToBlock(int8 *data) {
 
 	if (i < 27 && itm) {
 		_vm->_characters[c].inventory[slot] = 0;
-		_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[block].drawObjects, block, itm, p);
+		_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[block].drawObjects, block, itm, p);
 	}
 
 	return pos - data;
@@ -506,7 +506,7 @@ int EoBInfProcessor::oeob_printMessage_v1(int8 *data) {
 	int8 *pos = data;
 
 	strcpy(col, colorConfig);
-	const char *str = (const char*) pos;
+	const char *str = (const char *)pos;
 	pos += (strlen(str) + 1);
 
 	col[1] = *pos++;
@@ -1057,7 +1057,7 @@ int EoBInfProcessor::oeob_eval_v2(int8 *data) {
 				a = *pos++;
 				tempString1 = _vm->_itemNames[itm->nameId];
 				tempString1.toUppercase();
-				tempString2 = (const char*)pos;
+				tempString2 = (const char *)pos;
 				tempString2.toUppercase();
 				pos += a;
 				_stack[_stackIndex++] = tempString1.contains(tempString2) ? 1 : 0;
@@ -1067,7 +1067,7 @@ int EoBInfProcessor::oeob_eval_v2(int8 *data) {
 				a = *pos++;
 				tempString1 = _vm->_itemNames[itm->nameUnid];
 				tempString1.toUppercase();
-				tempString2 = (const char*)pos;
+				tempString2 = (const char *)pos;
 				tempString2.toUppercase();
 				pos += a;
 				_stack[_stackIndex++] = tempString1.contains(tempString2) ? 1 : 0;
@@ -1296,8 +1296,8 @@ int EoBInfProcessor::oeob_loadNewLevelOrMonsters(int8 *data) {
 	} else {
 		cmd = *pos++;
 		_vm->releaseMonsterShapes(cmd * 18, 18);
-		_vm->loadMonsterShapes((const char*)pos, cmd * 18, true, index * 18);
-		debugC(5, kDebugLevelScript, "         - loading monster shapes '%s', monster number '%d', encode type '%d'", (const char*)pos, cmd, index);
+		_vm->loadMonsterShapes((const char *)pos, cmd * 18, true, index * 18);
+		debugC(5, kDebugLevelScript, "         - loading monster shapes '%s', monster number '%d', encode type '%d'", (const char *)pos, cmd, index);
 		pos += 13;
 		_vm->gui_restorePlayField();
 		res = pos - data;
@@ -1329,7 +1329,7 @@ int EoBInfProcessor::oeob_createItem_v1(int8 *data) {
 			_vm->setHandItem(itm);
 			debugC(5, kDebugLevelScript, "         - create hand item '%d'", itm);
 		} else if (block != 0xffff) {
-			_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
+			_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
 			debugC(5, kDebugLevelScript, "         - create item '%d' on block '0x%.04X', position '%d'", itm, block, itmPos);
 		}
 	}
@@ -1365,14 +1365,14 @@ int EoBInfProcessor::oeob_createItem_v2(int8 *data) {
 			_vm->setHandItem(itm);
 			debugC(5, kDebugLevelScript, "         - create hand item '%d' (value '%d', flags '0x%X', icon number '%d')", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon);
 		} else {
-			_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[_vm->rollDice(1, 2, -1)]);
+			_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[_vm->rollDice(1, 2, -1)]);
 			debugC(5, kDebugLevelScript, "         - create item '%d' (value '%d', flags '0x%X', icon number '%d') on current block", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon);
 		}
 	} else if (block == 0xfffe) {
-		_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[(_vm->_currentDirection << 2) + _vm->rollDice(1, 2, -1)]);
+		_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[_vm->_currentBlock & 0x3ff].drawObjects, _vm->_currentBlock, itm, _itemPos[(_vm->_currentDirection << 2) + _vm->rollDice(1, 2, -1)]);
 		debugC(5, kDebugLevelScript, "         - create item '%d' (value '%d', flags '0x%X', icon number '%d') on current block", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon);
 	} else {
-		_vm->setItemPosition((Item*)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
+		_vm->setItemPosition((Item *)&_vm->_levelBlockProperties[block & 0x3ff].drawObjects, block, itm, itmPos);
 		debugC(5, kDebugLevelScript, "         - create item '%d' (value '%d', flags '0x%X', icon number '%d') on block '0x%.04X', position '%d'", itm, _vm->_items[itm].value, _vm->_items[itm].flags, _vm->_items[itm].icon, block, itmPos);
 	}
 
@@ -1509,35 +1509,35 @@ int EoBInfProcessor::oeob_dialogue(int8 *data) {
 	int8 *pos = data;
 
 	switch (*pos++) {
-		case -45:
-			_vm->drawSequenceBitmap((const char*)pos, pos[13], READ_LE_UINT16(pos + 14), READ_LE_UINT16(pos + 16), READ_LE_UINT16(pos + 18));
-			pos += 20;
-			break;
+	case -45:
+		_vm->drawSequenceBitmap((const char *)pos, pos[13], READ_LE_UINT16(pos + 14), READ_LE_UINT16(pos + 16), READ_LE_UINT16(pos + 18));
+		pos += 20;
+		break;
 
-		case -44:
-			_vm->restoreAfterDialogueSequence();
-			break;
+	case -44:
+		_vm->restoreAfterDialogueSequence();
+		break;
 
-		case -43:
-			_vm->initDialogueSequence();
-			break;
+	case -43:
+		_vm->initDialogueSequence();
+		break;
 
-		case -42:
-			_vm->gui_drawDialogueBox();
-			break;
+	case -42:
+		_vm->gui_drawDialogueBox();
+		break;
 
-		case -40:
-			_dlgResult = _vm->runDialogue(READ_LE_UINT16(pos), READ_LE_UINT16(pos + 6) == 0xffff ? 2 : 3, getString(READ_LE_UINT16(pos + 2)), getString(READ_LE_UINT16(pos + 4)), getString(READ_LE_UINT16(pos + 6)));
-			pos += 8;
-			break;
+	case -40:
+		_dlgResult = _vm->runDialogue(READ_LE_UINT16(pos), READ_LE_UINT16(pos + 6) == 0xffff ? 2 : 3, getString(READ_LE_UINT16(pos + 2)), getString(READ_LE_UINT16(pos + 4)), getString(READ_LE_UINT16(pos + 6)));
+		pos += 8;
+		break;
 
-		case -8:
-			_vm->txt()->printDialogueText(READ_LE_UINT16(pos), getString(READ_LE_UINT16(pos + 2)));
-			pos += 4;
-			break;
+	case -8:
+		_vm->txt()->printDialogueText(READ_LE_UINT16(pos), getString(READ_LE_UINT16(pos + 2)));
+		pos += 4;
+		break;
 
-		default:
-			break;
+	default:
+		break;
 	}
 
 	return pos - data;
@@ -1552,52 +1552,52 @@ int EoBInfProcessor::oeob_specialEvent(int8 *data) {
 	int i = 0;
 
 	switch (cmd) {
-		case 0:
-			_vm->drawScene(1);
-			_screen->_curPage = 2;
-			_screen->copyRegion(72, 0, 0, 0, 32, 120, 2, 12, Screen::CR_NO_P_CHECK);
-
-			for (; i < 4; i++) {
-				endTime = _vm->_system->getMillis() + _vm->_tickLength;
-				_vm->drawLightningColumn();
-				_screen->copyRegion(72, 0, 72, 0, 32, 120, 2, 0, Screen::CR_NO_P_CHECK);
-				_screen->updateScreen();
-				_screen->copyRegion(0, 0, 72, 0, 32, 120, 12, 2, Screen::CR_NO_P_CHECK);
-				_vm->delayUntil(endTime);
-			}
+	case 0:
+		_vm->drawScene(1);
+		_screen->_curPage = 2;
+		_screen->copyRegion(72, 0, 0, 0, 32, 120, 2, 12, Screen::CR_NO_P_CHECK);
+
+		for (; i < 4; i++) {
+			endTime = _vm->_system->getMillis() + _vm->_tickLength;
+			_vm->drawLightningColumn();
+			_screen->copyRegion(72, 0, 72, 0, 32, 120, 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+			_screen->copyRegion(0, 0, 72, 0, 32, 120, 12, 2, Screen::CR_NO_P_CHECK);
+			_vm->delayUntil(endTime);
+		}
 
-			_screen->_curPage = 0;
-			_vm->_sceneUpdateRequired = true;
-			break;
+		_screen->_curPage = 0;
+		_vm->_sceneUpdateRequired = true;
+		break;
 
-		case 1:
-			_dlgResult = _vm->charSelectDialogue();
-			break;
+	case 1:
+		_dlgResult = _vm->charSelectDialogue();
+		break;
 
-		case 2:
-			_vm->characterLevelGain(_dlgResult);
-			break;
+	case 2:
+		_vm->characterLevelGain(_dlgResult);
+		break;
 
-		case 3:
-			_dlgResult = _vm->resurrectionSelectDialogue();
-			break;
+	case 3:
+		_dlgResult = _vm->resurrectionSelectDialogue();
+		break;
 
-		case 4:
-			if (_vm->prepareForNewPartyMember(33, 5))
-				_vm->initNpc(4);
-			break;
+	case 4:
+		if (_vm->prepareForNewPartyMember(33, 5))
+			_vm->initNpc(4);
+		break;
 
-		case 5:
-			_vm->deletePartyItems(46, 5);
-			_vm->deletePartyItems(46, 6);
-			break;
+	case 5:
+		_vm->deletePartyItems(46, 5);
+		_vm->deletePartyItems(46, 6);
+		break;
 
-		case 6:
-			_vm->loadVcnData(0, 0);
-			break;
+	case 6:
+		_vm->loadVcnData(0, 0);
+		break;
 
-		default:
-			break;
+	default:
+		break;
 	}
 
 	return pos - data;
diff --git a/engines/kyra/sequences_eob.cpp b/engines/kyra/sequences_eob.cpp
index 29386894f3..8fdd8680b1 100644
--- a/engines/kyra/sequences_eob.cpp
+++ b/engines/kyra/sequences_eob.cpp
@@ -41,49 +41,49 @@ int EoBEngine::mainMenu() {
 
 	while (menuChoice >= 0 && !shouldQuit()) {
 		switch (menuChoice) {
-			case 0:
-				_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
-				_screen->loadEoBBitmap("INTRO", 0, 5, 3, 2);
-				_screen->setScreenPalette(_screen->getPalette(0));
-				_screen->_curPage = 2;
-				of = _screen->setFont(Screen::FID_6_FNT);
-				_screen->printText(gScummVMVersion, 280 - strlen(gScummVMVersion) * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
-				_screen->setFont(of);
-				_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
-				gui_drawBox(77, 165, 173, 29, 13, 14, 12);
-				gui_drawBox(76, 164, 175, 31, 13, 14, -1);
-				_screen->_curPage = 0;
-				_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
-				_screen->updateScreen();
-				menuChoice = mainMenuLoop();
-				break;
-
-			case 1:
-				// load game in progress
-				//
-				menuChoice = -1;
-				break;
-
-			case 2:
-				// create new party
-				menuChoice = -2;
-				break;
-
-			case 3:
-				// quit
-				menuChoice = -5;
-				break;
-
-			case 4:
-				// intro
-				_sound->loadSoundFile("SOUND");
-				_screen->hideMouse();
-				seq_playOpeningCredits();
-				seq_playIntro();
-				_screen->showMouse();
-				_sound->loadSoundFile("ADLIB");
-				menuChoice = 0;
-				break;
+		case 0:
+			_screen->loadPalette("EOBPAL.COL", _screen->getPalette(0));
+			_screen->loadEoBBitmap("INTRO", 0, 5, 3, 2);
+			_screen->setScreenPalette(_screen->getPalette(0));
+			_screen->_curPage = 2;
+			of = _screen->setFont(Screen::FID_6_FNT);
+			_screen->printText(gScummVMVersion, 280 - strlen(gScummVMVersion) * 6, 153, _screen->getPagePixel(2, 0, 0), 0);
+			_screen->setFont(of);
+			_screen->fillRect(0, 159, 319, 199, _screen->getPagePixel(2, 0, 0));
+			gui_drawBox(77, 165, 173, 29, 13, 14, 12);
+			gui_drawBox(76, 164, 175, 31, 13, 14, -1);
+			_screen->_curPage = 0;
+			_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0, Screen::CR_NO_P_CHECK);
+			_screen->updateScreen();
+			menuChoice = mainMenuLoop();
+			break;
+
+		case 1:
+			// load game in progress
+			//
+			menuChoice = -1;
+			break;
+
+		case 2:
+			// create new party
+			menuChoice = -2;
+			break;
+
+		case 3:
+			// quit
+			menuChoice = -5;
+			break;
+
+		case 4:
+			// intro
+			_sound->loadSoundFile("SOUND");
+			_screen->hideMouse();
+			seq_playOpeningCredits();
+			seq_playIntro();
+			_screen->showMouse();
+			_sound->loadSoundFile("ADLIB");
+			menuChoice = 0;
+			break;
 		}
 	}
 
@@ -478,7 +478,7 @@ void EoBEngine::seq_king() {
 
 	_screen->copyPage(0, 4);
 
-	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag(); ) {
+	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag();) {
 		runloop = false;
 		uint32 end = _system->getMillis() + 2 * _tickLength;
 
@@ -998,7 +998,7 @@ void EoBEngine::boxMorphTransition(int targetDestX, int targetDestY, int targetF
 
 	int w = 1;
 	int h = 1;
-	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag(); ) {
+	for (bool runloop = true; runloop && !shouldQuit() && !skipFlag();) {
 		uint32 end = _system->getMillis() + _tickLength;
 		_screen->copyRegion(targetSrcX << 3, targetSrcY << 3, targetDestX << 3, targetDestY << 3, w << 3, h << 3, 2, 0, Screen::CR_NO_P_CHECK);
 		if (originX1 < targetDestX)
@@ -1066,6 +1066,6 @@ void EoBEngine::whirlTransition() {
 	}
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB
diff --git a/engines/kyra/sprites_eob.cpp b/engines/kyra/sprites_eob.cpp
index e3cc8ebec2..dd49735271 100644
--- a/engines/kyra/sprites_eob.cpp
+++ b/engines/kyra/sprites_eob.cpp
@@ -174,7 +174,7 @@ void EoBCoreEngine::initMonster(int index, int unit, uint16 block, int pos, int
 }
 
 void EoBCoreEngine::placeMonster(EoBMonsterInPlay *m, uint16 block, int dir) {
-	if (block != 0xffff){
+	if (block != 0xffff) {
 		checkSceneUpdateNeed(m->block);
 		if (_levelBlockProperties[m->block].flags & 7) {
 			_levelBlockProperties[m->block].flags--;
@@ -201,11 +201,11 @@ void EoBCoreEngine::killMonster(EoBMonsterInPlay *m, bool giveExperience) {
 
 	if (m->randItem) {
 		if (rollDice(1, 10, 0) == 1)
-			setItemPosition((Item*)&_levelBlockProperties[m->block & 0x3ff].drawObjects, m->block, duplicateItem(m->randItem), pos);
+			setItemPosition((Item *)&_levelBlockProperties[m->block & 0x3ff].drawObjects, m->block, duplicateItem(m->randItem), pos);
 	}
 
 	if (m->fixedItem)
-		setItemPosition((Item*)&_levelBlockProperties[m->block & 0x3ff].drawObjects, m->block, duplicateItem(m->fixedItem), pos);
+		setItemPosition((Item *)&_levelBlockProperties[m->block & 0x3ff].drawObjects, m->block, duplicateItem(m->fixedItem), pos);
 
 	if (giveExperience)
 		increasePartyExperience(_monsterProps[m->type].experience);
@@ -223,7 +223,7 @@ void EoBCoreEngine::killMonster(EoBMonsterInPlay *m, bool giveExperience) {
 	}
 }
 
-bool EoBCoreEngine::killMonsterExtra(EoBMonsterInPlay*) {
+bool EoBCoreEngine::killMonsterExtra(EoBMonsterInPlay *) {
 	return true;
 }
 
@@ -439,7 +439,7 @@ void EoBCoreEngine::drawBlockItems(int index) {
 
 		o = itm->next;
 		forceLoop = false;
-		if(tile2 != -1)
+		if (tile2 != -1)
 			setLevelShapesDim(index, _shpDmX1, _shpDmX2, 5);
 	}
 }
@@ -481,7 +481,7 @@ void EoBCoreEngine::drawMonsters(int index) {
 	int cDirOffs = _currentDirection << 2;
 
 	EoBMonsterInPlay *drawObj[5];
-	memset(drawObj, 0, 5 * sizeof(EoBMonsterInPlay*));
+	memset(drawObj, 0, 5 * sizeof(EoBMonsterInPlay *));
 
 	for (int i = 0; i < 30; i++) {
 		if (_monsters[i].block != bl)
@@ -599,7 +599,7 @@ void EoBCoreEngine::drawFlyingObjects(int index) {
 		return;
 
 	EoBFlyingObject *drawObj[5];
-	memset(drawObj, 0, 5 * sizeof(EoBFlyingObject*));
+	memset(drawObj, 0, 5 * sizeof(EoBFlyingObject *));
 
 	for (int i = 0; i < 10; i++) {
 		if (!_flyingObjects[i].enable || blockIndex != _flyingObjects[i].curBlock)
@@ -1087,7 +1087,7 @@ void EoBCoreEngine::walkMonster(EoBMonsterInPlay *m, int destBlock) {
 	if (m->flags & 8) {
 		// Interestingly, the fear spell in EOB 1 does not expire.
 		// I don't know whether this is intended or not.
-		if (_flags.gameID == GI_EOB1 ) {
+		if (_flags.gameID == GI_EOB1) {
 			d ^= 4;
 		} else if (m->spellStatusLeft > 0) {
 			if (--m->spellStatusLeft == 0)
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 7bbe9f528f..d51bf4eee3 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -209,11 +209,11 @@ const uint8 EoBCoreEngine::_teleporterShapeDefs[] = {
 
 const uint8 EoBCoreEngine::_wallOfForceShapeDefs[] = {
 	0x00, 0x00, 0x04, 0x08,
-	0x00, 0x08,	0x04, 0x08,
+	0x00, 0x08, 0x04, 0x08,
 	0x04, 0x00, 0x04, 0x08,
 	0x04, 0x08, 0x04, 0x08,
 	0x08, 0x00, 0x05, 0x10,
-	0x0C, 0x00,	0x05, 0x10
+	0x0C, 0x00, 0x05, 0x10
 };
 
 const int16 EoBCoreEngine::_buttonList1[] = {
@@ -222,14 +222,14 @@ const int16 EoBCoreEngine::_buttonList1[] = {
 };
 
 const int16 EoBCoreEngine::_buttonList2[] = {
-	58, 61, 62, 63,	64, 65, 93, 94, 66, 67, 68, 69, 70, 71, 76, 77, 88, 0, 1, 2, 3,
-	90, 91,  4,  5,	6, 7, 8, 9, 10, 11, 12, 78, 79, 13, 14, 15, 16, 80, 81, 17, 18,
-	19, 20, 82, 83,	49, 50, 51, 52, 53, 54, 56, 57, -1
+	58, 61, 62, 63, 64, 65, 93, 94, 66, 67, 68, 69, 70, 71, 76, 77, 88, 0, 1, 2, 3,
+	90, 91,  4,  5, 6, 7, 8, 9, 10, 11, 12, 78, 79, 13, 14, 15, 16, 80, 81, 17, 18,
+	19, 20, 82, 83, 49, 50, 51, 52, 53, 54, 56, 57, -1
 };
 
 const int16 EoBCoreEngine::_buttonList3[] = {
-	58, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,	32, 33, 34, 35, 36, 37, 38, 39,
-	40, 41, 42, 43, 44, 45, 84, 85, 46, 47, 48, 60,	59, 92, 4, 5, 6, 7, 8, 49,  50,
+	58, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+	40, 41, 42, 43, 44, 45, 84, 85, 46, 47, 48, 60, 59, 92, 4, 5, 6, 7, 8, 49,  50,
 	51, 52, 53, 54, 56, 57, -1
 };
 
@@ -238,8 +238,8 @@ const int16 EoBCoreEngine::_buttonList4[] = {
 };
 
 const int16 EoBCoreEngine::_buttonList5[] = {
-	58, 61, 62, 63, 64, 65, 93, 66,	67, 68, 69, 70, 71, 88, 21, 22, 23, 24, 25, 26,
-	27, 28, 29, 30, 31, 32, 33, 34,	35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 84,
+	58, 61, 62, 63, 64, 65, 93, 66, 67, 68, 69, 70, 71, 88, 21, 22, 23, 24, 25, 26,
+	27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 84,
 	85, 46, 47, 48, 60, 59, 92, 4, 5, 6, 7, 8, 49, 50, 51, 52, 53, 54, 56, 57, -1
 };
 
@@ -364,18 +364,18 @@ void EoBCoreEngine::initStaticResource() {
 	_npcPreset = _staticres->loadEoBNpcData(kEoBBaseNpcPresets, temp);
 
 	_teleporterShapeCoords = _staticres->loadRawData(kEoBBaseDscTelptrShpCoords, temp);
-	_portalSeq = (const int8*)_staticres->loadRawData(kEoBBasePortalSeqData, temp);
+	_portalSeq = (const int8 *)_staticres->loadRawData(kEoBBasePortalSeqData, temp);
 	_mnDef = _staticres->loadRawData(kEoBBaseManDef, temp);
 	_mnWord = _staticres->loadStrings(kEoBBaseManWord, _mnNumWord);
 	_mnPrompt = _staticres->loadStrings(kEoBBaseManPrompt, temp);
 
-	_monsterStepTable0 = (int8*) _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterStepTable02 : kEoBBaseMonsterStepTable01, temp);
-	_monsterStepTable1 = (int8*)_staticres->loadRawData(kEoBBaseMonsterStepTable1, temp);
-	_monsterStepTable2 = (int8*)_staticres->loadRawData(kEoBBaseMonsterStepTable2, temp);
-	_monsterStepTable3 = (int8*)_staticres->loadRawData(kEoBBaseMonsterStepTable3, temp);
+	_monsterStepTable0 = (int8 *)_staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterStepTable02 : kEoBBaseMonsterStepTable01, temp);
+	_monsterStepTable1 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable1, temp);
+	_monsterStepTable2 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable2, temp);
+	_monsterStepTable3 = (int8 *)_staticres->loadRawData(kEoBBaseMonsterStepTable3, temp);
 	_monsterCloseAttPosTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttPosTable1, temp);
 	_monsterCloseAttPosTable2 = _staticres->loadRawData(_flags.gameID == GI_EOB2 ? kEoBBaseMonsterCloseAttPosTable22 : kEoBBaseMonsterCloseAttPosTable21, temp);
-	_monsterCloseAttUnkTable = (int8*)_staticres->loadRawData(kEoBBaseMonsterCloseAttUnkTable, temp);
+	_monsterCloseAttUnkTable = (int8 *)_staticres->loadRawData(kEoBBaseMonsterCloseAttUnkTable, temp);
 	_monsterCloseAttChkTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable1, temp);
 	_monsterCloseAttChkTable2 = _staticres->loadRawData(kEoBBaseMonsterCloseAttChkTable2, temp);
 	_monsterCloseAttDstTable1 = _staticres->loadRawData(kEoBBaseMonsterCloseAttDstTable1, temp);
@@ -383,26 +383,26 @@ void EoBCoreEngine::initStaticResource() {
 
 	_monsterProximityTable = _staticres->loadRawData(kEoBBaseMonsterProximityTable, temp);
 	_findBlockMonstersTable = _staticres->loadRawData(kEoBBaseFindBlockMonstersTable, temp);
-	_monsterDirChangeTable = (const int8*)_staticres->loadRawData(kEoBBaseMonsterDirChangeTable, temp);
+	_monsterDirChangeTable = (const int8 *)_staticres->loadRawData(kEoBBaseMonsterDirChangeTable, temp);
 	_monsterSpecAttStrings = _staticres->loadStrings(kEoBBaseMonsterDistAttStrings, temp);
 
-	_monsterFrmOffsTable1 = (const int8*)_staticres->loadRawData(kEoBBaseDscMonsterFrmOffsTbl1, temp);
-	_monsterFrmOffsTable2 = (const int8*)_staticres->loadRawData(kEoBBaseDscMonsterFrmOffsTbl2, temp);
+	_monsterFrmOffsTable1 = (const int8 *)_staticres->loadRawData(kEoBBaseDscMonsterFrmOffsTbl1, temp);
+	_monsterFrmOffsTable2 = (const int8 *)_staticres->loadRawData(kEoBBaseDscMonsterFrmOffsTbl2, temp);
 
 	_inventorySlotsX = _staticres->loadRawDataBe16(kEoBBaseInvSlotX, temp);
 	_inventorySlotsY = _staticres->loadRawData(kEoBBaseInvSlotY, temp);
 	_slotValidationFlags = _staticres->loadRawDataBe16(kEoBBaseSlotValidationFlags, temp);
 
-	_projectileWeaponAmmoTypes = (const int8*)_staticres->loadRawData(kEoBBaseProjectileWeaponTypes, temp);
+	_projectileWeaponAmmoTypes = (const int8 *)_staticres->loadRawData(kEoBBaseProjectileWeaponTypes, temp);
 	_wandTypes = _staticres->loadRawData(kEoBBaseWandTypes, temp);
 
 	_drawObjPosIndex = _staticres->loadRawData(kEoBBaseDrawObjPosIndex, temp);
 	_flightObjFlipIndex = _staticres->loadRawData(kEoBBaseFlightObjFlipIndex, temp);
-	_flightObjShpMap = (const int8*)_staticres->loadRawData(kEoBBaseFlightObjShpMap, temp);
-	_flightObjSclIndex = (const int8*)_staticres->loadRawData(kEoBBaseFlightObjSclIndex, temp);
+	_flightObjShpMap = (const int8 *)_staticres->loadRawData(kEoBBaseFlightObjShpMap, temp);
+	_flightObjSclIndex = (const int8 *)_staticres->loadRawData(kEoBBaseFlightObjSclIndex, temp);
 
 	_wllFlagPreset = _staticres->loadRawData(kEoBBaseWllFlagPreset, _wllFlagPresetSize);
-	_dscShapeCoords = (const int16*)_staticres->loadRawDataBe16(kEoBBaseDscShapeCoords, temp);
+	_dscShapeCoords = (const int16 *)_staticres->loadRawDataBe16(kEoBBaseDscShapeCoords, temp);
 
 	_dscDoorScaleOffs = _staticres->loadRawData(kEoBBaseDscDoorScaleOffs, temp);
 	_dscDoorScaleMult1 = _staticres->loadRawData(kEoBBaseDscDoorScaleMult1, temp);
@@ -411,8 +411,8 @@ void EoBCoreEngine::initStaticResource() {
 	_dscDoorY1 = _staticres->loadRawData(kEoBBaseDscDoorY1, temp);
 	_dscDoorXE = _staticres->loadRawData(kEoBBaseDscDoorXE, temp);
 
-	_dscItemPosIndex= _staticres->loadRawData(kEoBBaseDscItemPosIndex, temp);
-	_dscItemShpX = (const int16*)_staticres->loadRawDataBe16(kEoBBaseDscItemShpX, temp);
+	_dscItemPosIndex = _staticres->loadRawData(kEoBBaseDscItemPosIndex, temp);
+	_dscItemShpX = (const int16 *)_staticres->loadRawDataBe16(kEoBBaseDscItemShpX, temp);
 	_dscItemScaleIndex = _staticres->loadRawData(kEoBBaseDscItemScaleIndex, temp);
 	_dscItemTileIndex = _staticres->loadRawData(kEoBBaseDscItemTileIndex, temp);
 	_dscItemShapeMap = _staticres->loadRawData(kEoBBaseDscItemShapeMap, temp);
@@ -451,10 +451,10 @@ void EoBCoreEngine::initStaticResource() {
 	_magicFlightObjectProperties = _staticres->loadRawData(kEoBBaseMagicFlightProps, temp);
 	_turnUndeadEffect = _staticres->loadRawData(kEoBBaseTurnUndeadEffect, temp);
 	_burningHandsDest = _staticres->loadRawData(kEoBBaseBurningHandsDest, temp);
-	_coneOfColdDest1 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest1, temp);
-	_coneOfColdDest2 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest2, temp);
-	_coneOfColdDest3 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest3, temp);
-	_coneOfColdDest4 = (const int8*)_staticres->loadRawData(kEoBBaseConeOfColdDest4, temp);
+	_coneOfColdDest1 = (const int8 *)_staticres->loadRawData(kEoBBaseConeOfColdDest1, temp);
+	_coneOfColdDest2 = (const int8 *)_staticres->loadRawData(kEoBBaseConeOfColdDest2, temp);
+	_coneOfColdDest3 = (const int8 *)_staticres->loadRawData(kEoBBaseConeOfColdDest3, temp);
+	_coneOfColdDest4 = (const int8 *)_staticres->loadRawData(kEoBBaseConeOfColdDest4, temp);
 	_coneOfColdGfxTbl = _staticres->loadRawData(kEoBBaseConeOfColdGfxTbl, _coneOfColdGfxTblSize);
 
 	// Hard code the following strings, since EOB I doesn't have them in the original.
@@ -462,9 +462,9 @@ void EoBCoreEngine::initStaticResource() {
 	// save slot. Instead of emulating this we provide a menu similiar to EOB II.
 
 	static const char *saveLoadStrings[3][4] = {
-		{	"Cancel",	"Empty Slot",	"Save Game",	"Load Game"		},
-		{	"Abbr.",	"Leerer Slot",	"Speichern",	"  Laden"		},
-		{	0,			0,				0,				0				}
+		{   "Cancel",   "Empty Slot",   "Save Game",    "Load Game"     },
+		{   "Abbr.",    "Leerer Slot",  "Speichern",    "  Laden"       },
+		{   0,          0,              0,              0               }
 	};
 
 	static const char *errorSlotEmptyString[3] = {
@@ -735,84 +735,84 @@ void EoBCoreEngine::initSpells() {
 		1, 546, 0, 1, // 10 mystic defense
 	};
 
-	Common::Array<const uint16*> magicTimingParaAssign;
+	Common::Array<const uint16 *> magicTimingParaAssign;
 	mpn;
 	mpn;
 	mpn;
-	mp(0);	// Detect Magic
-	mpn;	// Magic Missile
+	mp(0);  // Detect Magic
+	mpn;    // Magic Missile
 	mp1n;
-	mp(1);	// Shield
-	mp(2);	// Shocking Grasp
-	mp2(3);	// Blur
-	mp2(1);	// Detect Invis
-	mp2n;	// Imp Identify
-	mpn;	// Invis
+	mp(1);  // Shield
+	mp(2);  // Shocking Grasp
+	mp2(3); // Blur
+	mp2(1); // Detect Invis
+	mp2n;   // Imp Identify
+	mpn;    // Invis
 	mp1n;
-	mpn;	// Melf
-	mp1n;	// Stinking Cloud
-	mpn;	// Dispel Magic
-	mpn;	// Fireball
-	mp1n;	// Flame Arrow
-	mp(3);	// Haste
-	mpn;	// Hold Person
-	mpn;	// Invisibility
-	mpn;	// Lightning Bolt
-	mp(2);	// Vampiric Touch
-	mpn;	// Fear
-	mpn;	// Ice Storm
-	mp1n;	// Stone Skin
-	mp1n;	// Cloud Kill
-	mp2(4);	// Improved Invisibility
-	mp2n;	// remove Curse
-	mpn;	// Cone of Cold
-	mpn;	// Hold Monster
-	mp2n;	// Wall of Force
-	mp2n;	// Disintegrate
-	mp2n;	// Flesh To Stone
-	mp2n;	// Stone To Flesh
-	mp2(2);	// True Seeing
-	mp2n;	// Finger of Death
-	mp2n;	// Power Word Stun
-	mp2n;	// Bigby's Fist
-	mp2n;	// empty
-	mp(5);	// Bless
-	mpn;						// EOB1: cure, EOB2: cause
-	mpn;						// EOB1: cause, EOB2: cure
-	mp(0);	// Detect Magic
-	mp(6);	// Prot from Evil
-	mp(7);	// Aid
-	mp(8);	// Flame Blad
-	mpn;	// Hold Person
-	mp(9);	// Slow Poison
-	mpn;	// Create Food
-	mpn;	// Dispel Magic
-	mp(1);	// Magical Vestment
-	mp(2);	// Prayer
-	mpn;	// Remove Paralysis
-	mpn;						// EOB1: cure, EOB2: cause
-	mpn;						// EOB1: cause, EOB2: cure
-	mpn;	// Neutral Poison
-	mp(6);	// Prot From Evil 10'
-	mp1n;	// Prot From Lightning
-	mpn;						// EOB1: cure, EOB2: cause
-	mpn;						// EOB1: cause, EOB2: cure
-	mpn;	// Flame Strike
-	mpn;	// Raise Dead
-	mp2n;	// Slay Living
-	mp2(2);	// True Seeing
-	mp2n;	// Harm
-	mp2n;	// Heal
-	mp2n;	// Resurrect
-	mpn;	// Lay on Hands
-	mp2n;	// Turn Undead
-	mpn;	// Lightning Bolt (EOB1) / Fireball 1(EOB2) passive
+	mpn;    // Melf
+	mp1n;   // Stinking Cloud
+	mpn;    // Dispel Magic
+	mpn;    // Fireball
+	mp1n;   // Flame Arrow
+	mp(3);  // Haste
+	mpn;    // Hold Person
+	mpn;    // Invisibility
+	mpn;    // Lightning Bolt
+	mp(2);  // Vampiric Touch
+	mpn;    // Fear
+	mpn;    // Ice Storm
+	mp1n;   // Stone Skin
+	mp1n;   // Cloud Kill
+	mp2(4); // Improved Invisibility
+	mp2n;   // remove Curse
+	mpn;    // Cone of Cold
+	mpn;    // Hold Monster
+	mp2n;   // Wall of Force
+	mp2n;   // Disintegrate
+	mp2n;   // Flesh To Stone
+	mp2n;   // Stone To Flesh
+	mp2(2); // True Seeing
+	mp2n;   // Finger of Death
+	mp2n;   // Power Word Stun
+	mp2n;   // Bigby's Fist
+	mp2n;   // empty
+	mp(5);  // Bless
+	mpn;                        // EOB1: cure, EOB2: cause
+	mpn;                        // EOB1: cause, EOB2: cure
+	mp(0);  // Detect Magic
+	mp(6);  // Prot from Evil
+	mp(7);  // Aid
+	mp(8);  // Flame Blad
+	mpn;    // Hold Person
+	mp(9);  // Slow Poison
+	mpn;    // Create Food
+	mpn;    // Dispel Magic
+	mp(1);  // Magical Vestment
+	mp(2);  // Prayer
+	mpn;    // Remove Paralysis
+	mpn;                        // EOB1: cure, EOB2: cause
+	mpn;                        // EOB1: cause, EOB2: cure
+	mpn;    // Neutral Poison
+	mp(6);  // Prot From Evil 10'
+	mp1n;   // Prot From Lightning
+	mpn;                        // EOB1: cure, EOB2: cause
+	mpn;                        // EOB1: cause, EOB2: cure
+	mpn;    // Flame Strike
+	mpn;    // Raise Dead
+	mp2n;   // Slay Living
+	mp2(2); // True Seeing
+	mp2n;   // Harm
+	mp2n;   // Heal
+	mp2n;   // Resurrect
+	mpn;    // Lay on Hands
+	mp2n;   // Turn Undead
+	mpn;    // Lightning Bolt (EOB1) / Fireball 1(EOB2) passive
 	mp2(10);// Mystic Defense
-	mp2n;	// Fireball 2 passive
-	mpn;	// death spell passive
-	mpn;	// disintegrate passive
-	mp2n;	// cause critical passive
-	mp2n;	// flesh to stone passive
+	mp2n;   // Fireball 2 passive
+	mpn;    // death spell passive
+	mpn;    // disintegrate passive
+	mp2n;   // cause critical passive
+	mp2n;   // flesh to stone passive
 
 	Common::Array<SpellStartCallback> startCallback;
 	sc(empty);
@@ -828,7 +828,7 @@ void EoBCoreEngine::initSpells() {
 	sc2(improvedIdentify);
 	sc(empty);
 	sc(melfsAcidArrow);
-	sc1(empty);		// Stinking Cloud
+	sc1(empty);     // Stinking Cloud
 	sc(dispelMagic);
 	sc(fireball);
 	sc1(flameArrow);
@@ -839,7 +839,7 @@ void EoBCoreEngine::initSpells() {
 	sc(vampiricTouch);
 	sc(fear);
 	sc(iceStorm);
-	sc1(stoneSkin);	// stone skin
+	sc1(stoneSkin); // stone skin
 	sc2(empty); // imp invisibility
 	sc1(empty); // Cloudkill
 	sc2(removeCurse);
@@ -854,7 +854,7 @@ void EoBCoreEngine::initSpells() {
 	sc2(powerWordStun);
 	sc2(empty);
 	sc2(empty);
-	sc(empty);	// Bless
+	sc(empty);  // Bless
 	sc2(causeLightWounds);
 	sc(cureLightWounds);
 	sc1(causeLightWounds);
@@ -909,7 +909,7 @@ void EoBCoreEngine::initSpells() {
 	ec2(empty);
 	ec2(empty);
 	ec(melfsAcidArrow);
-	ec1(empty);		// Stinking Cloud
+	ec1(empty);     // Stinking Cloud
 	ec(empty);
 	ec(fireball);
 	ec1(flameArrow);
@@ -920,8 +920,8 @@ void EoBCoreEngine::initSpells() {
 	ec(vampiricTouch);
 	ec(empty);
 	ec(iceStorm);
-	ec(empty);		// EOB1: stone skin, EOB2: imp invisibility
-	ec(empty);		// EOB1: cloud kill, EOB2: remove curse
+	ec(empty);      // EOB1: stone skin, EOB2: imp invisibility
+	ec(empty);      // EOB1: cloud kill, EOB2: remove curse
 	ec(empty);
 	ec(holdMonster);
 	ec2(empty);
@@ -933,7 +933,7 @@ void EoBCoreEngine::initSpells() {
 	ec2(empty);
 	ec2(empty);
 	ec2(empty);
-	ec(empty);	// Bless
+	ec(empty);  // Bless
 	ec(empty);
 	ec(empty);
 	ec(detectMagic);
@@ -951,7 +951,7 @@ void EoBCoreEngine::initSpells() {
 	ec(empty);
 	ec(empty);
 	ec(empty);
-	ec1(empty);	// Prot from Lightning
+	ec1(empty); // Prot from Lightning
 	ec(empty);
 	ec(empty);
 	ec(flameStrike);
@@ -1049,7 +1049,7 @@ void EoBEngine::initStaticResource() {
 	_dscDoorY5 = _staticres->loadRawData(kEoBBaseDscDoorY5, temp);
 	_dscDoorY6 = _staticres->loadRawData(kEoBBaseDscDoorY6, temp);
 	_dscDoorY7 = _staticres->loadRawData(kEoBBaseDscDoorY7, temp);
-	_dscDoorCoordsExt = (const int16*)_staticres->loadRawDataBe16(kEoBBaseDscDoorCoordsExt, temp);
+	_dscDoorCoordsExt = (const int16 *)_staticres->loadRawDataBe16(kEoBBaseDscDoorCoordsExt, temp);
 
 	_enemyMageSpellList = _staticres->loadRawData(kEoB1EnemyMageSpellList, temp);
 	_enemyMageSfx = _staticres->loadRawData(kEoB1EnemyMageSfx, temp);
@@ -1081,7 +1081,7 @@ void EoBEngine::initStaticResource() {
 		p->dmgDc[0].base = (int8)*ps++;
 		p->dmgDc[1].times = *ps++;
 		p->dmgDc[1].pips = *ps++;
-		p->dmgDc[1].base =(int8) *ps++;
+		p->dmgDc[1].base = (int8)*ps++;
 		p->dmgDc[2].times = *ps++;
 		p->dmgDc[2].pips = *ps++;
 		p->dmgDc[2].base = (int8)*ps++;
@@ -1120,59 +1120,59 @@ void EoBEngine::initSpells() {
 	};
 
 	static const FlagTableEntry flagTable[] = {
-		{ 0x0000, 0x000000, 0x00 },	// dummy
-		{ 0x0033, 0x000001, 0x00 },	// armor
-		{ 0x0100, 0x000000, 0x21 },	// burning hands
-		{ 0x004c, 0x000002, 0x00 },	// detect magic
-		{ 0x0100, 0x000000, 0x01 },	// magic missile
-		{ 0x0000, 0x000000, 0x00 },	// dummy
-		{ 0x008b, 0x000008, 0x00 },	// shield
-		{ 0x0488, 0x000000, 0x03 },	// shocking grasp
-		{ 0x0021, 0x000040, 0x00 },	// invisibility
-		{ 0x0000, 0x000000, 0x00 },	// dummy
-		{ 0x0100, 0x000000, 0x11 },	// melf's acid arrow
-		{ 0x0000, 0x000000, 0x00 },	// STINKING CLOUD
-		{ 0x1000, 0x000000, 0x00 },	// dispel magic
-		{ 0x0100, 0x000000, 0x21 },	// fireball
-		{ 0x0100, 0x000000, 0x11 },	// FLAME ARROW
-		{ 0x0248, 0x010000, 0x00 },	// haste
-		{ 0x0100, 0x000000, 0x00 },	// hold person
-		{ 0x0240, 0x000040, 0x00 },	// inv 10'
-		{ 0x0100, 0x000000, 0x03 },	// lightning bolt
-		{ 0x0488, 0x000000, 0x01 },	// vampiric touch
-		{ 0x0100, 0x000000, 0x00 },	// fear
-		{ 0x0100, 0x000000, 0x41 },	// ice storm
-		{ 0x0033, 0x000001, 0x00 },	// STONE SKIN
-		{ 0x0000, 0x000000, 0x00 },	// CLOUD KILL
-		{ 0x0100, 0x000000, 0x41 },	// cone of cold
-		{ 0x0100, 0x000000, 0x00 },	// hold monster
-		{ 0x005c, 0x000400, 0x00 },	// bless
-		{ 0x0020, 0x000000, 0x00 },	// cure light wounds
-		{ 0x0100, 0x000000, 0x01 },	// cause light wounds
-		{ 0x004c, 0x000002, 0x00 },	// detect magic
-		{ 0x0029, 0x000800, 0x00 },	// prot from evil
-		{ 0x0039, 0x000000, 0x00 },	// aid
-		{ 0x2408, 0x000000, 0x21 },	// flame blade
-		{ 0x0100, 0x000000, 0x00 },	// hold person
-		{ 0x0028, 0x002000, 0x00 },	// slow poison
-		{ 0x0040, 0x000000, 0x00 },	// create food
-		{ 0x1000, 0x000000, 0x00 },	// dispel magic
-		{ 0x0099, 0x004000, 0x00 },	// magical vestment
-		{ 0x004c, 0x008000, 0x00 },	// prayer
-		{ 0x0040, 0x000000, 0x00 },	// remove paralysis
-		{ 0x0020, 0x000000, 0x00 },	// cure serious
-		{ 0x0100, 0x000000, 0x01 },	// cause serious
-		{ 0x0020, 0x000000, 0x00 },	// neutralize poison
-		{ 0x0248, 0x000800, 0x00 },	// prot from evil 10'
-		{ 0x0000, 0x000000, 0x00 },	// PROT FROM LIGHTNING
-		{ 0x0020, 0x000000, 0x00 },	// cure critical
-		{ 0x0100, 0x000000, 0x01 },	// cause critical
-		{ 0x0100, 0x000000, 0x21 },	// flame strike
-		{ 0x0020, 0x000000, 0x00 },	// raise dead
-		{ 0x0020, 0x000000, 0x00 },	// lay on hands
-		{ 0x0000, 0x000000, 0x00 },	// obj hit passive
-		{ 0x0000, 0x000000, 0x00 },	// disintegrate passive
-		{ 0x0000, 0x000000, 0x00 }	// death spell passive
+		{ 0x0000, 0x000000, 0x00 }, // dummy
+		{ 0x0033, 0x000001, 0x00 }, // armor
+		{ 0x0100, 0x000000, 0x21 }, // burning hands
+		{ 0x004c, 0x000002, 0x00 }, // detect magic
+		{ 0x0100, 0x000000, 0x01 }, // magic missile
+		{ 0x0000, 0x000000, 0x00 }, // dummy
+		{ 0x008b, 0x000008, 0x00 }, // shield
+		{ 0x0488, 0x000000, 0x03 }, // shocking grasp
+		{ 0x0021, 0x000040, 0x00 }, // invisibility
+		{ 0x0000, 0x000000, 0x00 }, // dummy
+		{ 0x0100, 0x000000, 0x11 }, // melf's acid arrow
+		{ 0x0000, 0x000000, 0x00 }, // STINKING CLOUD
+		{ 0x1000, 0x000000, 0x00 }, // dispel magic
+		{ 0x0100, 0x000000, 0x21 }, // fireball
+		{ 0x0100, 0x000000, 0x11 }, // FLAME ARROW
+		{ 0x0248, 0x010000, 0x00 }, // haste
+		{ 0x0100, 0x000000, 0x00 }, // hold person
+		{ 0x0240, 0x000040, 0x00 }, // inv 10'
+		{ 0x0100, 0x000000, 0x03 }, // lightning bolt
+		{ 0x0488, 0x000000, 0x01 }, // vampiric touch
+		{ 0x0100, 0x000000, 0x00 }, // fear
+		{ 0x0100, 0x000000, 0x41 }, // ice storm
+		{ 0x0033, 0x000001, 0x00 }, // STONE SKIN
+		{ 0x0000, 0x000000, 0x00 }, // CLOUD KILL
+		{ 0x0100, 0x000000, 0x41 }, // cone of cold
+		{ 0x0100, 0x000000, 0x00 }, // hold monster
+		{ 0x005c, 0x000400, 0x00 }, // bless
+		{ 0x0020, 0x000000, 0x00 }, // cure light wounds
+		{ 0x0100, 0x000000, 0x01 }, // cause light wounds
+		{ 0x004c, 0x000002, 0x00 }, // detect magic
+		{ 0x0029, 0x000800, 0x00 }, // prot from evil
+		{ 0x0039, 0x000000, 0x00 }, // aid
+		{ 0x2408, 0x000000, 0x21 }, // flame blade
+		{ 0x0100, 0x000000, 0x00 }, // hold person
+		{ 0x0028, 0x002000, 0x00 }, // slow poison
+		{ 0x0040, 0x000000, 0x00 }, // create food
+		{ 0x1000, 0x000000, 0x00 }, // dispel magic
+		{ 0x0099, 0x004000, 0x00 }, // magical vestment
+		{ 0x004c, 0x008000, 0x00 }, // prayer
+		{ 0x0040, 0x000000, 0x00 }, // remove paralysis
+		{ 0x0020, 0x000000, 0x00 }, // cure serious
+		{ 0x0100, 0x000000, 0x01 }, // cause serious
+		{ 0x0020, 0x000000, 0x00 }, // neutralize poison
+		{ 0x0248, 0x000800, 0x00 }, // prot from evil 10'
+		{ 0x0000, 0x000000, 0x00 }, // PROT FROM LIGHTNING
+		{ 0x0020, 0x000000, 0x00 }, // cure critical
+		{ 0x0100, 0x000000, 0x01 }, // cause critical
+		{ 0x0100, 0x000000, 0x21 }, // flame strike
+		{ 0x0020, 0x000000, 0x00 }, // raise dead
+		{ 0x0020, 0x000000, 0x00 }, // lay on hands
+		{ 0x0000, 0x000000, 0x00 }, // obj hit passive
+		{ 0x0000, 0x000000, 0x00 }, // disintegrate passive
+		{ 0x0000, 0x000000, 0x00 }  // death spell passive
 	};
 
 	int temp;
@@ -1201,7 +1201,7 @@ void DarkMoonEngine::initStaticResource() {
 		_seqIntro[i] = _staticres->loadEoB2SeqData(kEoB2IntroSeqData00 + i, temp);
 
 	_shapesIntro = new const EoBShapeDef*[13];
-	memset(_shapesIntro, 0, sizeof(EoBShapeDef*) * 13);
+	memset(_shapesIntro, 0, sizeof(EoBShapeDef *) * 13);
 	_shapesIntro[0] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes00, temp);
 	_shapesIntro[1] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes01, temp);
 	_shapesIntro[4] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes04, temp);
@@ -1216,7 +1216,7 @@ void DarkMoonEngine::initStaticResource() {
 		_seqFinale[i] = _staticres->loadEoB2SeqData(kEoB2FinaleSeqData00 + i, temp);
 
 	_shapesFinale = new const EoBShapeDef*[13];
-	memset(_shapesFinale, 0, sizeof(EoBShapeDef*) * 13);
+	memset(_shapesFinale, 0, sizeof(EoBShapeDef *) * 13);
 	_shapesFinale[0] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes00, temp);
 	_shapesFinale[3] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes03, temp);
 	_shapesFinale[7] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes07, temp);
@@ -1229,12 +1229,12 @@ void DarkMoonEngine::initStaticResource() {
 	_npcStrings[0] = _staticres->loadStrings(kEoB2Npc1Strings, temp);
 	_npcStrings[1] = _staticres->loadStrings(kEoB2Npc2Strings, temp);
 	_monsterDustStrings = _staticres->loadStrings(kEoB2MonsterDustStrings, temp);
-	_dreamSteps = (const int8*)_staticres->loadRawData(kEoB2DreamSteps, temp);
+	_dreamSteps = (const int8 *)_staticres->loadRawData(kEoB2DreamSteps, temp);
 	_kheldranStrings = _staticres->loadStrings(kEoB2KheldranStrings, temp);
 	_hornStrings = _staticres->loadStrings(kEoB2HornStrings, temp);
 	_hornSounds = _staticres->loadRawData(kEoB2HornSounds, temp);
 
-	_wallOfForceDsX = (const int16*)_staticres->loadRawDataBe16(kEoB2WallOfForceDsX, temp);
+	_wallOfForceDsX = (const int16 *)_staticres->loadRawDataBe16(kEoB2WallOfForceDsX, temp);
 	_wallOfForceDsY = _staticres->loadRawData(kEoB2WallOfForceDsY, temp);
 	_wallOfForceDsNumW = _staticres->loadRawData(kEoB2WallOfForceNumW, temp);
 	_wallOfForceDsNumH = _staticres->loadRawData(kEoB2WallOfForceNumH, temp);
@@ -1250,19 +1250,22 @@ void DarkMoonEngine::initStaticResource() {
 
 	// ScummVM specific
 	static const char *transferStringsScummVM[3][5] = {
-		{	"\r We cannot find any EOB save game\r file. Please make sure that the\r save game file with the party\r you wish to transfer is located\r in your ScummVM save game\r directory. If you have set up\r multiple save directories you\r have to copy the EOB save file\r into your EOB II save directory.\r Do you wish to try again?",
+		{
+			"\r We cannot find any EOB save game\r file. Please make sure that the\r save game file with the party\r you wish to transfer is located\r in your ScummVM save game\r directory. If you have set up\r multiple save directories you\r have to copy the EOB save file\r into your EOB II save directory.\r Do you wish to try again?",
 			"Game ID",
 			"\r It seems that you have already\r defeated Xanathar here. Do you\r wish to transfer the party that\r finished the game? If not, you\r will be able to select a save\r game from the save game\r dialogue.",
 			"Select File",
 			"\r\r   Please wait..."
 		},
-		{	"\r Kein EOB-Spielstand zu finden.\r Bitte Spielstandsdatei mit der\r zu ]bernehmenden Gruppe in das\r ScummVM Spielstands-Verzeichnis\r kopieren. Bei mehreren Spiel-\r stands-Verzeichnissen bitte\r den EOB-Spielstand in das\r EOB II-Spielstands-Verzeichnis\r kopieren. Nochmal versuchen?",
+		{
+			"\r Kein EOB-Spielstand zu finden.\r Bitte Spielstandsdatei mit der\r zu ]bernehmenden Gruppe in das\r ScummVM Spielstands-Verzeichnis\r kopieren. Bei mehreren Spiel-\r stands-Verzeichnissen bitte\r den EOB-Spielstand in das\r EOB II-Spielstands-Verzeichnis\r kopieren. Nochmal versuchen?",
 			"Game ID",
 			"\r Wie es scheint, wurde Xanathar\r hier bereits besiegt. Soll die\r Gruppe, mit der das Spiel be-\r endet wurde, ]bernommen werden?\r Falls nicht, kann ein Spielstand\r aus der Spielstandsliste gew[hlt\r werden.",
 			"Spiel W[hlen",
 			"\r\r  Bitte warten..."
 		},
-		{	0, 0, 0, 0
+		{
+			0, 0, 0, 0
 		}
 	};
 
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp
index 9cc08b9a78..8ad28c2ec4 100644
--- a/engines/kyra/timer_eob.cpp
+++ b/engines/kyra/timer_eob.cpp
@@ -355,6 +355,6 @@ void EoBCoreEngine::timerUpdateMonsterIdleAnim(int timerNum) {
 	}
 }
 
-}	// End of namespace Kyra
+} // End of namespace Kyra
 
 #endif // ENABLE_EOB