[Scummvm-cvs-logs] CVS: scummvm/scumm cursor.cpp,2.45,2.46 intern.h,2.511,2.512 scumm.cpp,1.553,1.554 scumm.h,1.635,1.636

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv722

Modified Files:
	cursor.cpp intern.h scumm.cpp scumm.h 
Log Message:
Applied patch #1238516, with very minor modifications. It gets rid of an
old DOTT hack/workaround.


Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/cursor.cpp,v
retrieving revision 2.45
retrieving revision 2.46
diff -u -d -r2.45 -r2.46
--- cursor.cpp	24 Jun 2005 15:23:09 -0000	2.45
+++ cursor.cpp	19 Jul 2005 17:53:45 -0000	2.46
@@ -75,6 +75,22 @@
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
 };
 
+static const byte default_v6_cursor[] = {
+	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+	0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x0F,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0xFF,
+	0x0F,0x0F,0x0F,0x0F,0x0F,0x0F, 0x0F,0x0F,0x0F, 0x0F,0x0F,0x0F,0x0F,0x0F,0x0F,0xFF,
+	0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x0F,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0xFF,
+	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0x00,0x0F,0x00, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
+};
+
 ScummEngine_v5::ScummEngine_v5(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex)
  : ScummEngine(detector, syst, gs, md5sum, substResFileNameIndex) {
 
@@ -133,7 +149,12 @@
 	setCursorFromBuffer((byte *)vs->pixels + (y - vs->topline) * vs->pitch + x, w, h, vs->pitch);
 }
 
-void ScummEngine::setCursorFromBuffer(byte *ptr, int width, int height, int pitch) {
+void ScummEngine_v6::setDefaultCursor() {
+	setCursorHotspot(7, 6);
+	setCursorFromBuffer(default_v6_cursor, 16, 13, 16);
+}
+
+void ScummEngine::setCursorFromBuffer(const byte *ptr, int width, int height, int pitch) {
 	uint size;
 	byte *dst;
 

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.511
retrieving revision 2.512
diff -u -d -r2.511 -r2.512
--- intern.h	7 Jul 2005 09:10:19 -0000	2.511
+++ intern.h	19 Jul 2005 17:53:46 -0000	2.512
@@ -537,6 +537,7 @@
 	virtual void writeArray(int array, int index, int base, int value);
 	void shuffleArray(int num, int minIdx, int maxIdx);
 
+	void setDefaultCursor();
 	void setCursorTransparency(int a);
 	void setCursorHotspot(int x, int y);
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -d -r1.553 -r1.554
--- scumm.cpp	16 Jul 2005 17:10:50 -0000	1.553
+++ scumm.cpp	19 Jul 2005 17:53:54 -0000	1.554
@@ -1840,12 +1840,7 @@
 
 void ScummEngine_v6::scummInit() {
 	ScummEngine::scummInit();
-
-	if (_gameId == GID_TENTACLE && res.roomno[rtRoom][60]) {
-		// HACK: For DOTT we manually set the default cursor. See also bug #786994
-		setCursorFromImg(697, 60, 1);
-		setCursorTransparency(1);
-	}
+	setDefaultCursor();
 }
 
 void ScummEngine_v60he::scummInit() {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.635
retrieving revision 1.636
diff -u -d -r1.635 -r1.636
--- scumm.h	11 Jul 2005 10:59:03 -0000	1.635
+++ scumm.h	19 Jul 2005 17:53:55 -0000	1.636
@@ -983,7 +983,7 @@
 
 	void setupCursor();
 
-	void setCursorFromBuffer(byte *ptr, int width, int height, int pitch);
+	void setCursorFromBuffer(const byte *ptr, int width, int height, int pitch);
 
 public:
 	void markRectAsDirty(VirtScreenNumber virt, int left, int right, int top, int bottom, int dirtybit = 0);