[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.50,1.51 cutaway.h,1.24,1.25

David Eriksson twogood at users.sourceforge.net
Thu Nov 6 13:16:09 CET 2003


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv8853/queen

Modified Files:
	cutaway.cpp cutaway.h 
Log Message:
Bug fix for non-quittable cutaways.


Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- cutaway.cpp	6 Nov 2003 15:47:37 -0000	1.50
+++ cutaway.cpp	6 Nov 2003 21:15:35 -0000	1.51
@@ -100,7 +100,7 @@
 	_comPanel = READ_BE_UINT16(ptr);
 	ptr += 2;
 
-	_cutawayObjectCount = READ_BE_UINT16(ptr);
+	_cutawayObjectCount = (int16)READ_BE_UINT16(ptr);
 	ptr += 2;
 	debug(0, "_cutawayObjectCount = %i", _cutawayObjectCount);
 

Index: cutaway.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- cutaway.h	6 Nov 2003 08:44:33 -0000	1.24
+++ cutaway.h	6 Nov 2003 21:15:35 -0000	1.25
@@ -162,7 +162,7 @@
 		bool _roomFade;
 
 		//! Number of cutaway objects at _cutawayData
-		int _cutawayObjectCount;
+		int16 _cutawayObjectCount;
 
 		//! This cutaway is followed by another
 		bool _anotherCutaway;





More information about the Scummvm-git-logs mailing list