KYRA: Some formatting fixes.

1 files changed, 23 insertions, 23 deletions

diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/items_lok.cpp
index 7e41811441..2937038463 100644
--- a/engines/kyra/items_lok.cpp
+++ b/engines/kyra/items_lok.cpp
@@ -38,7 +38,7 @@ int KyraEngine_LoK::findDuplicateItemShape(int shape) {
 
 	while (dupTable[i] != 0xFF) {
 		if (dupTable[i] == shape)
-			return dupTable[i+1];
+			return dupTable[i + 1];
 		i += 2;
 	}
 	return -1;
@@ -180,7 +180,7 @@ void KyraEngine_LoK::setMouseItem(Item item) {
 	if (item == kItemNone)
 		_screen->setMouseCursor(1, 1, _shapes[6]);
 	else
-		_screen->setMouseCursor(8, 15, _shapes[216+item]);
+		_screen->setMouseCursor(8, 15, _shapes[216 + item]);
 }
 
 void KyraEngine_LoK::wipeDownMouseItem(int xpos, int ypos) {
@@ -196,16 +196,16 @@ void KyraEngine_LoK::wipeDownMouseItem(int xpos, int ypos) {
 
 	while (height >= 0) {
 		restoreItemRect1(xpos, ypos);
-		_screen->setNewShapeHeight(_shapes[216+_itemInHand], height);
+		_screen->setNewShapeHeight(_shapes[216 + _itemInHand], height);
 		uint32 nextTime = _system->getMillis() + 1 * _tickLength;
-		_screen->drawShape(0, _shapes[216+_itemInHand], xpos, y, 0, 0);
+		_screen->drawShape(0, _shapes[216 + _itemInHand], xpos, y, 0, 0);
 		_screen->updateScreen();
 		y += 2;
 		height -= 2;
 		delayUntil(nextTime);
 	}
 	restoreItemRect1(xpos, ypos);
-	_screen->resetShapeHeight(_shapes[216+_itemInHand]);
+	_screen->resetShapeHeight(_shapes[216 + _itemInHand]);
 	removeHandItem();
 	_screen->showMouse();
 }
@@ -517,7 +517,7 @@ void KyraEngine_LoK::itemDropDown(int x, int y, int destX, int destY, byte freeI
 			drawY = tempY - 16;
 			backUpItemRect0(drawX, drawY);
 			uint32 nextTime = _system->getMillis() + 1 * _tickLength;
-			_screen->drawShape(0, _shapes[216+item], drawX, drawY, 0, 0);
+			_screen->drawShape(0, _shapes[216 + item], drawX, drawY, 0, 0);
 			_screen->updateScreen();
 			delayUntil(nextTime);
 		}
@@ -554,7 +554,7 @@ void KyraEngine_LoK::itemDropDown(int x, int y, int destX, int destY, byte freeI
 				drawY = tempY - 16;
 				backUpItemRect0(drawX, drawY);
 				uint32 nextTime = _system->getMillis() + 1 * _tickLength;
-				_screen->drawShape(0, _shapes[216+item], drawX, drawY, 0, 0);
+				_screen->drawShape(0, _shapes[216 + item], drawX, drawY, 0, 0);
 				_screen->updateScreen();
 				delayUntil(nextTime);
 			}
@@ -597,7 +597,7 @@ void KyraEngine_LoK::itemSpecialFX(int x, int y, int item) {
 }
 
 void KyraEngine_LoK::itemSpecialFX1(int x, int y, int item) {
-	uint8 *shape = _shapes[216+item];
+	uint8 *shape = _shapes[216 + item];
 	x -= 8;
 	int startY = y;
 	y -= 15;
@@ -635,7 +635,7 @@ void KyraEngine_LoK::itemSpecialFX2(int x, int y, int item) {
 	for (int i = 204; i >= 201; --i) {
 		restoreItemRect0(x, y);
 		uint32 nextTime = _system->getMillis() + 3 * _tickLength;
-		_screen->drawShape(0, _shapes[216+item], x, y, 0, 0);
+		_screen->drawShape(0, _shapes[216 + item], x, y, 0, 0);
 		_screen->drawShape(0, _shapes[i], x, y + yAdd, 0, 0);
 		_screen->updateScreen();
 		delayUntil(nextTime);
@@ -687,7 +687,7 @@ void KyraEngine_LoK::magicOutMouseItem(int animIndex, int itemPos) {
 	for (int shape = _magicMouseItemStartFrame[animIndex]; shape <= _magicMouseItemEndFrame[animIndex]; ++shape) {
 		restoreItemRect1(x, y);
 		uint32 nextTime = _system->getMillis() + 4 * _tickLength;
-		_screen->drawShape(0, _shapes[216+_itemInHand], x + 4, y + 3, 0, 0);
+		_screen->drawShape(0, _shapes[216 + _itemInHand], x + 4, y + 3, 0, 0);
 		if (tableIndex == -1)
 			_screen->drawShape(0, _shapes[shape], x, y, 0, 0);
 		else
@@ -705,7 +705,7 @@ void KyraEngine_LoK::magicOutMouseItem(int animIndex, int itemPos) {
 	for (int shape = _magicMouseItemStartFrame2[animIndex]; shape <= _magicMouseItemEndFrame2[animIndex]; ++shape) {
 		restoreItemRect1(x, y);
 		uint32 nextTime = _system->getMillis() + 4 * _tickLength;
-		_screen->drawShape(0, _shapes[216+_itemInHand], x + 4, y + 3, 0, 0);
+		_screen->drawShape(0, _shapes[216 + _itemInHand], x + 4, y + 3, 0, 0);
 		if (tableIndex == -1)
 			_screen->drawShape(0, _shapes[shape], x, y, 0, 0);
 		else
@@ -789,12 +789,12 @@ void KyraEngine_LoK::magicInMouseItem(int animIndex, int item, int itemPos) {
 	}
 	restoreItemRect1(x, y);
 	if (itemPos == -1) {
-		_screen->setMouseCursor(8, 15, _shapes[216+item]);
+		_screen->setMouseCursor(8, 15, _shapes[216 + item]);
 		_itemInHand = item;
 	} else {
 		_characterList[0].inventoryItems[itemPos] = item;
 		_screen->hideMouse();
-		_screen->drawShape(0, _shapes[216+item], _itemPosX[itemPos], _itemPosY[itemPos], 0, 0);
+		_screen->drawShape(0, _shapes[216 + item], _itemPosX[itemPos], _itemPosY[itemPos], 0, 0);
 		_screen->showMouse();
 	}
 	_screen->showMouse();
@@ -847,7 +847,7 @@ void KyraEngine_LoK::updatePlayerItemsForScene() {
 		if (_itemInHand > 33)
 			_itemInHand = 33;
 		_screen->hideMouse();
-		_screen->setMouseCursor(8, 15, _shapes[216+_itemInHand]);
+		_screen->setMouseCursor(8, 15, _shapes[216 + _itemInHand]);
 		_screen->showMouse();
 	}
 
@@ -890,7 +890,7 @@ void KyraEngine_LoK::redrawInventory(int page) {
 
 		if (_currentCharacter->inventoryItems[i] != kItemNone) {
 			uint8 item = _currentCharacter->inventoryItems[i];
-			_screen->drawShape(page, _shapes[216+item], _itemPosX[i], _itemPosY[i], 0, 0);
+			_screen->drawShape(page, _shapes[216 + item], _itemPosX[i], _itemPosY[i], 0, 0);
 		}
 	}
 	_screen->showMouse();
@@ -899,23 +899,23 @@ void KyraEngine_LoK::redrawInventory(int page) {
 }
 
 void KyraEngine_LoK::backUpItemRect0(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 3<<3, 24);
-	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 3<<3, 24, _itemBkgBackUp[0]);
+	_screen->rectClip(xpos, ypos, 3 << 3, 24);
+	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 3 << 3, 24, _itemBkgBackUp[0]);
 }
 
 void KyraEngine_LoK::restoreItemRect0(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 3<<3, 24);
-	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 3<<3, 24, _itemBkgBackUp[0]);
+	_screen->rectClip(xpos, ypos, 3 << 3, 24);
+	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 3 << 3, 24, _itemBkgBackUp[0]);
 }
 
 void KyraEngine_LoK::backUpItemRect1(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 4<<3, 32);
-	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 4<<3, 32, _itemBkgBackUp[1]);
+	_screen->rectClip(xpos, ypos, 4 << 3, 32);
+	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 4 << 3, 32, _itemBkgBackUp[1]);
 }
 
 void KyraEngine_LoK::restoreItemRect1(int xpos, int ypos) {
-	_screen->rectClip(xpos, ypos, 4<<3, 32);
-	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 4<<3, 32, _itemBkgBackUp[1]);
+	_screen->rectClip(xpos, ypos, 4 << 3, 32);
+	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 4 << 3, 32, _itemBkgBackUp[1]);
 }
 
 int KyraEngine_LoK::getItemListIndex(Item item) {