aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/items_v2.cpp
diff options
context:
space:
mode:
authorJordi Vilalta Prat2008-01-27 19:47:41 +0000
committerJordi Vilalta Prat2008-01-27 19:47:41 +0000
commit66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (patch)
treee27aadabecd8dd910884280e6559ff9c94c3d73c /engines/kyra/items_v2.cpp
parent278857698dc7b1623096fe1ad12511dc4c886c7e (diff)
downloadscummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.gz
scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.bz2
scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.zip
Removed trailing spaces.
svn-id: r30664
Diffstat (limited to 'engines/kyra/items_v2.cpp')
-rw-r--r--engines/kyra/items_v2.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/kyra/items_v2.cpp b/engines/kyra/items_v2.cpp
index bc90b32544..02aeb7912c 100644
--- a/engines/kyra/items_v2.cpp
+++ b/engines/kyra/items_v2.cpp
@@ -78,7 +78,7 @@ int KyraEngine_v2::checkItemCollision(int x, int y) {
yPos = curItem.y;
}
}
-
+
return itemPos;
}
@@ -139,7 +139,7 @@ bool KyraEngine_v2::processItemDrop(uint16 sceneId, uint16 item, int x, int y, i
}
int itemHeight = _itemHtDat[item];
-
+
// no idea why it's '&&' here and not single checks for x and y
if (x == -1 && y == -1) {
x = _rnd.getRandomNumberRng(0x10, 0x130);
@@ -188,7 +188,7 @@ bool KyraEngine_v2::processItemDrop(uint16 sceneId, uint16 item, int x, int y, i
if (itemX == -1 || itemY == -1)
return false;
-
+
if (unk1 == 3) {
_itemList[freeItemSlot].x = itemX;
_itemList[freeItemSlot].y = itemY;
@@ -286,7 +286,7 @@ void KyraEngine_v2::itemDropDown(int startX, int startY, int dstX, int dstY, int
uint16 endDelay = _system->getMillis() + _tickLength;
_screen->drawShape(0, itemShape, x, y, 0, 0);
_screen->updateScreen();
-
+
// XXX: original doesn't update game state while delaying
// our implementation *could* do it, so maybe check this again
delayUntil(endDelay);
@@ -295,7 +295,7 @@ void KyraEngine_v2::itemDropDown(int startX, int startY, int dstX, int dstY, int
restoreGfxRect24x24(x, y);
} else {
restoreGfxRect24x24(curX, curY-16);
- }
+ }
}
if (_layerFlagTable[_screen->getLayer(dstX, dstY)] && item != 13) {
@@ -329,10 +329,10 @@ void KyraEngine_v2::exchangeMouseItem(int itemPos) {
snd_playSoundEffect(0x0b);
setMouseCursor(_itemInHand);
int str2 = 7;
-
+
if (_lang == 1)
str2 = getItemCommandStringPickUp(itemId);
-
+
updateCommandLineEx(itemId + 54, str2, 0xD6);
_screen->showMouse();
@@ -341,7 +341,7 @@ void KyraEngine_v2::exchangeMouseItem(int itemPos) {
bool KyraEngine_v2::pickUpItem(int x, int y) {
int itemPos = checkItemCollision(x, y);
-
+
if (itemPos <= -1)
return false;
@@ -355,10 +355,10 @@ bool KyraEngine_v2::pickUpItem(int x, int y) {
snd_playSoundEffect(0x0b);
setMouseCursor(itemId);
int str2 = 7;
-
+
if (_lang == 1)
str2 = getItemCommandStringPickUp(itemId);
-
+
updateCommandLineEx(itemId + 54, str2, 0xD6);
_itemInHand = itemId;
_screen->showMouse();
@@ -375,7 +375,7 @@ bool KyraEngine_v2::isDropable(int x, int y) {
x -= 8;
y -= 1;
-
+
for (int xpos = x; xpos < x + 16; ++xpos) {
if (_screen->getShapeFlag1(xpos, y) == 0)
return false;