aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorAlyssa Milburn2010-12-21 18:15:56 +0000
committerAlyssa Milburn2010-12-21 18:15:56 +0000
commite97b2d25d1cf649c1e6ec9a41c85fbc76c41e2d3 (patch)
tree96d56d4c6f5d9a79a3d2f63954d9b95123ae30df /engines
parent7b0760f1bc5c28abcede041a6e3930f84ff3d319 (diff)
downloadscummvm-rg350-e97b2d25d1cf649c1e6ec9a41c85fbc76c41e2d3.tar.gz
scummvm-rg350-e97b2d25d1cf649c1e6ec9a41c85fbc76c41e2d3.tar.bz2
scummvm-rg350-e97b2d25d1cf649c1e6ec9a41c85fbc76c41e2d3.zip
MOHAWK: Allow DefaultCursorManager to use alternative tags
svn-id: r54987
Diffstat (limited to 'engines')
-rw-r--r--engines/mohawk/cursors.cpp2
-rw-r--r--engines/mohawk/cursors.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/engines/mohawk/cursors.cpp b/engines/mohawk/cursors.cpp
index 675f2d86bb..3fdc4c46b0 100644
--- a/engines/mohawk/cursors.cpp
+++ b/engines/mohawk/cursors.cpp
@@ -107,7 +107,7 @@ void DefaultCursorManager::setCursor(uint16 id) {
// The Broderbund devs decided to rip off the Mac format, it seems.
// However, they reversed the x/y hotspot. That makes it totally different!!!!
- Common::SeekableReadStream *stream = _vm->getResource(ID_TCUR, id);
+ Common::SeekableReadStream *stream = _vm->getResource(_tag, id);
byte cursorBitmap[16 * 16];
decodeMacXorCursor(stream, cursorBitmap);
diff --git a/engines/mohawk/cursors.h b/engines/mohawk/cursors.h
index 7ff99a342f..067c3bad7f 100644
--- a/engines/mohawk/cursors.h
+++ b/engines/mohawk/cursors.h
@@ -35,6 +35,8 @@ namespace Common {
class String;
}
+#include "mohawk/resource.h"
+
namespace Mohawk {
// 803-805 are animated, one large bmp which is in chunks - these are NEVER USED
@@ -87,13 +89,14 @@ protected:
// Uses standard tCUR resources
class DefaultCursorManager : public CursorManager {
public:
- DefaultCursorManager(MohawkEngine *vm) : _vm(vm) {}
+ DefaultCursorManager(MohawkEngine *vm, uint32 tag = ID_TCUR) : _vm(vm), _tag(tag) {}
~DefaultCursorManager() {}
void setCursor(uint16 id);
private:
MohawkEngine *_vm;
+ uint32 _tag;
};
// The cursor manager for Myst