[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.245,2.246 script_v80he.cpp,2.16,2.17

Gregory Montoir cyx at users.sourceforge.net
Mon Sep 13 11:02:02 CEST 2004


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

Modified Files:
	intern.h script_v80he.cpp 
Log Message:
fix cursors hotspot

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.245
retrieving revision 2.246
diff -u -d -r2.245 -r2.246
--- intern.h	13 Sep 2004 13:59:02 -0000	2.245
+++ intern.h	13 Sep 2004 18:01:25 -0000	2.246
@@ -784,7 +784,7 @@
 	virtual void executeOpcode(byte i);
 	virtual const char *getOpcodeDesc(byte i);
 
-	void loadImgSpot(int resId, int state, Common::Point spot);
+	void loadImgSpot(int resId, int state, Common::Point &spot);
 	void loadWizCursor(int resId, int resType, bool state);
 
 	

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -d -r2.16 -r2.17
--- script_v80he.cpp	13 Sep 2004 04:45:21 -0000	2.16
+++ script_v80he.cpp	13 Sep 2004 18:01:25 -0000	2.17
@@ -537,7 +537,7 @@
 	VAR(VAR_USERPUT) = _userPut;
 }
 
-void ScummEngine_v80he::loadImgSpot(int resId, int state, Common::Point spot) {
+void ScummEngine_v80he::loadImgSpot(int resId, int state, Common::Point &spot) {
 	const uint8 *dataPtr = getResourceAddress(rtImage, resId);
 	if (!dataPtr)
 		error("loadImgSpot: unknown Image %d", resId);
@@ -547,8 +547,8 @@
 	if (!spotPtr) {
 		spot.x = spot.y = 0;
 	} else {
-		spot.x = (int16)READ_LE_UINT32(spotPtr + 8);
-		spot.y = (int16)READ_LE_UINT32(spotPtr + 12);
+		spot.x = (int16)READ_LE_UINT32(spotPtr + 0);
+		spot.y = (int16)READ_LE_UINT32(spotPtr + 4);
 	}
 }
 





More information about the Scummvm-git-logs mailing list