aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_v1.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2007-12-24 22:27:30 +0000
committerJohannes Schickel2007-12-24 22:27:30 +0000
commit28a57c434a190fa3f40b3c428f9ee5642a3d04cc (patch)
tree1f6f98c467b8ea49d6311af77ba70bf17af3c049 /engines/kyra/kyra_v1.cpp
parent6b722c2f1c2dd328e02808a5a8b2eee0b58034f0 (diff)
downloadscummvm-rg350-28a57c434a190fa3f40b3c428f9ee5642a3d04cc.tar.gz
scummvm-rg350-28a57c434a190fa3f40b3c428f9ee5642a3d04cc.tar.bz2
scummvm-rg350-28a57c434a190fa3f40b3c428f9ee5642a3d04cc.zip
Cleanup(/formatting).
svn-id: r29983
Diffstat (limited to 'engines/kyra/kyra_v1.cpp')
-rw-r--r--engines/kyra/kyra_v1.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index ecc1faa873..db0f374f16 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -895,11 +895,10 @@ void KyraEngine_v1::updateMousePointer(bool forceUpdate) {
if (mouse.y > 158 || (mouse.x >= 12 && mouse.x < 308 && mouse.y < 136 && mouse.y >= 12) || forceUpdate) {
_mouseState = _itemInHand;
_screen->hideMouse();
- if (_itemInHand == -1) {
+ if (_itemInHand == -1)
_screen->setMouseCursor(1, 1, _shapes[0]);
- } else {
+ else
_screen->setMouseCursor(8, 15, _shapes[216+_itemInHand]);
- }
_screen->showMouse();
}
}
@@ -966,11 +965,10 @@ int KyraEngine_v1::checkForNPCScriptRun(int xpos, int ypos) {
charLeft = currentChar->x1 - 12;
charRight = currentChar->x1 + 11;
charTop = currentChar->y1 - 48;
- // if (!i) {
+ // if (!i)
// charBottom = currentChar->y2 - 16;
- // } else {
+ // else
charBottom = currentChar->y1;
- // }
if (xpos < charLeft || xpos > charRight || ypos < charTop || charBottom < ypos)
continue;