aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorMax Horn2004-08-22 23:38:00 +0000
committerMax Horn2004-08-22 23:38:00 +0000
commitb20187a0e92a284deb62298a63017de6e63a3661 (patch)
tree8af7efb32dbcfdc1f94aa6a3835fbb517987c50c /scumm/script_v6.cpp
parent45ac190548b0b0f33c8dbc391cf14869862b1dac (diff)
downloadscummvm-rg350-b20187a0e92a284deb62298a63017de6e63a3661.tar.gz
scummvm-rg350-b20187a0e92a284deb62298a63017de6e63a3661.tar.bz2
scummvm-rg350-b20187a0e92a284deb62298a63017de6e63a3661.zip
Cursor code cleanup
svn-id: r14690
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 21748811af..07d0235e56 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -976,7 +976,7 @@ void ScummEngine_v6::o6_cursorCommand() {
case 0x99: // SO_CURSOR_IMAGE Set cursor image
{
int room, obj = popRoomAndObj(&room);
- setCursorImg(obj, room, 1);
+ setCursorFromImg(obj, room, 1);
break;
}
case 0x9A: // SO_CURSOR_HOTSPOT Set cursor hotspot
@@ -992,7 +992,7 @@ void ScummEngine_v6::o6_cursorCommand() {
_charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i];
break;
case 0xD6: // SO_CURSOR_TRANSPARENT Set cursor transparent color
- makeCursorColorTransparent(pop());
+ setCursorTransparency(pop());
break;
default:
error("o6_cursorCommand: default case %x", subOp);
@@ -2567,7 +2567,7 @@ void ScummEngine_v6::o6_kernelSetFunctions() {
}
break;
case 12:
- setCursorImg(args[1], (uint) - 1, args[2]);
+ setCursorFromImg(args[1], (uint) - 1, args[2]);
break;
case 13:
derefActor(args[1], "o6_kernelSetFunctions:13")->remapActorPalette(args[2], args[3], args[4], -1);