aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parallaction_ns.cpp
diff options
context:
space:
mode:
authorChristopher Page2008-06-02 21:36:45 +0000
committerChristopher Page2008-06-02 21:36:45 +0000
commit0cbfc3a9d1b30822373360aa4c398518c9a74990 (patch)
tree24c865ed3153978aa00df03613b1bdde1a6efe5d /engines/parallaction/parallaction_ns.cpp
parenta338d5fdb2715a7b29ae789c632a0cfa05803079 (diff)
parent6f09c5a9286f97a1fac6e85fa4092295bc779440 (diff)
downloadscummvm-rg350-0cbfc3a9d1b30822373360aa4c398518c9a74990.tar.gz
scummvm-rg350-0cbfc3a9d1b30822373360aa4c398518c9a74990.tar.bz2
scummvm-rg350-0cbfc3a9d1b30822373360aa4c398518c9a74990.zip
Merged revisions 32348-32349,32351-32356,32358-32411,32413-32441,32443-32445,32449,32453-32454,32456-32457,32459-32462,32464-32465,32467-32492,32494-32503 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk svn-id: r32505
Diffstat (limited to 'engines/parallaction/parallaction_ns.cpp')
-rw-r--r--engines/parallaction/parallaction_ns.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index 8254a85a34..74003ee78b 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -172,18 +172,8 @@ void Parallaction_ns::freeFonts() {
}
void Parallaction_ns::initCursors() {
-
_mouseComposedArrow = _disk->loadPointer("pointer");
-
- byte temp[MOUSEARROW_WIDTH*MOUSEARROW_HEIGHT];
- memcpy(temp, _mouseArrow, MOUSEARROW_WIDTH*MOUSEARROW_HEIGHT);
-
- uint16 k = 0;
- for (uint16 i = 0; i < 4; i++) {
- for (uint16 j = 0; j < 64; j++) _mouseArrow[k++] = temp[i + j * 4];
- }
-
- return;
+ _mouseArrow = _resMouseArrow;
}
void Parallaction_ns::setArrowCursor() {