[Scummvm-cvs-logs] SF.net SVN: scummvm:[54987] scummvm/trunk/engines/mohawk

[fuzzie at users.sourceforge.net]

Revision: 54987
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54987&view=rev
Author:   fuzzie
Date:     2010-12-21 18:15:56 +0000 (Tue, 21 Dec 2010)

Log Message:
-----------
MOHAWK: Allow DefaultCursorManager to use alternative tags

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/cursors.cpp
    scummvm/trunk/engines/mohawk/cursors.h

Modified: scummvm/trunk/engines/mohawk/cursors.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/cursors.cpp	2010-12-21 15:36:27 UTC (rev 54986)
+++ scummvm/trunk/engines/mohawk/cursors.cpp	2010-12-21 18:15:56 UTC (rev 54987)
@@ -107,7 +107,7 @@
 	// 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);

Modified: scummvm/trunk/engines/mohawk/cursors.h
===================================================================
--- scummvm/trunk/engines/mohawk/cursors.h	2010-12-21 15:36:27 UTC (rev 54986)
+++ scummvm/trunk/engines/mohawk/cursors.h	2010-12-21 18:15:56 UTC (rev 54987)
@@ -35,6 +35,8 @@
 	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 @@
 // 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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.