[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.349,1.350 wiz_he.h,2.8,2.9 wiz_he.cpp,2.16,2.17

kirben kirben at users.sourceforge.net
Tue Mar 8 21:05:04 CET 2005


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

Modified Files:
	scumm.cpp wiz_he.h wiz_he.cpp 
Log Message:

_imagesNum should be clear in startScene()


Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -d -r1.349 -r1.350
--- scumm.cpp	7 Mar 2005 01:04:07 -0000	1.349
+++ scumm.cpp	9 Mar 2005 05:04:13 -0000	1.350
@@ -2038,9 +2038,10 @@
 		stopCycle(0);
 	_sound->processSoundQues();
 
-	if (_heversion >= 71) {
+	if (_heversion >= 71)
 		((ScummEngine_v70he *)this)->_wiz.polygonClear();
-	}
+	if (_heversion >= 72)
+		((ScummEngine_v72he *)this)->_wiz.imageNumClear();
 
 	// For HE80+ games
 	for (i = 0; i < _numRoomVariables; i++)

Index: wiz_he.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.h,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -d -r2.8 -r2.9
--- wiz_he.h	28 Feb 2005 20:19:56 -0000	2.8
+++ wiz_he.h	9 Mar 2005 05:04:14 -0000	2.9
@@ -109,6 +109,7 @@
 	WizPolygon _polygons[NUM_POLYGONS];
 	
 	Wiz();
+	void imageNumClear();
 
 	void polygonClear();
 	void polygonLoad(const uint8 *polData);

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.16
retrieving revision 2.17
diff -u -d -r2.16 -r2.17
--- wiz_he.cpp	8 Mar 2005 20:27:33 -0000	2.16
+++ wiz_he.cpp	9 Mar 2005 05:04:14 -0000	2.17
@@ -35,6 +35,10 @@
 	memset(&_polygons, 0, sizeof(_polygons));
 }
 
+void Wiz::imageNumClear() {
+	_imagesNum = 0;
+}
+
 void Wiz::polygonClear() {
 	memset(&_polygons, 0, sizeof(_polygons));
 }





More information about the Scummvm-git-logs mailing list