[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.363,2.364 scumm.cpp,1.336,1.337 sprite_he.cpp,1.42,1.43

[kirben]

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

Modified Files:
	intern.h scumm.cpp sprite_he.cpp 
Log Message:

Update sprite calls in main loop


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.363
retrieving revision 2.364
diff -u -d -r2.363 -r2.364
--- intern.h	24 Feb 2005 06:47:12 -0000	2.363
+++ intern.h	24 Feb 2005 08:00:24 -0000	2.364
@@ -968,13 +968,13 @@
 	void spriteGroupCheck(int spriteGroupId);
 	void spriteMarkIfInGroup(int spriteGroupId, uint32 flags);
 	void spriteInfoSet_addImageToList(int spriteId, int imageNum, int *spriteIdptr);
-	void spritesUpdateImages();
 
 public:
 	void spritesBlitToScreen();
 	void spritesMarkDirty(bool unkFlag);
 	void spritesSortActiveSprites();
 	void spritesProcessWiz(bool arg);
+	void spritesUpdateImages();
 
 protected:
 	/* HE version 90 script opcodes */

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -d -r1.336 -r1.337
--- scumm.cpp	24 Feb 2005 07:43:29 -0000	1.336
+++ scumm.cpp	24 Feb 2005 08:00:30 -0000	1.337
@@ -1859,13 +1859,15 @@
 		}
 		if (_heversion >= 71) {
 			preProcessAuxQueue();
-			processActors();
-			postProcessAuxQueue();
 
 			if (_heversion >= 90) {
 				((ScummEngine_v90he *)this)->spritesMarkDirty(0);
 				((ScummEngine_v90he *)this)->spritesProcessWiz(true);
 			}
+
+			processActors();
+			postProcessAuxQueue();
+
 		} else {
 			processActors();
 		}
@@ -1940,6 +1942,9 @@
 	/* show or hide mouse */
 	_system->showMouse(_cursor.state > 0);
 
+	if (_heversion >= 90)
+		((ScummEngine_v90he *)this)->spritesUpdateImages();
+
 	if (VAR_TIMER != 0xFF)
 		VAR(VAR_TIMER) = 0;
 	return VAR(VAR_TIMER_NEXT);

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- sprite_he.cpp	24 Feb 2005 06:47:12 -0000	1.42
+++ sprite_he.cpp	24 Feb 2005 08:00:30 -0000	1.43
@@ -1119,9 +1119,9 @@
 
 		if (spi->flags & kSF16) {
 			if (!spi->flags & kSF23) {
-				if (!spi->flags & kSF30)
+				if (!(spi->flags & kSF30))
 					spi->flags |= kSFNeedRedraw;
-				if (!spi->flags & kSF31)
+				if (!(spi->flags & kSF31))
 					spi->flags |= kSF01;
 			}
 			if (spi->group_num)