[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.96,1.97

Gregory Montoir cyx at users.sourceforge.net
Fri Nov 14 08:18:03 CET 2003


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

Modified Files:
	logic.cpp 
Log Message:
fix 'wrong background when talking to Faye inside the plane' issue

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- logic.cpp	14 Nov 2003 14:35:51 -0000	1.96
+++ logic.cpp	14 Nov 2003 16:16:55 -0000	1.97
@@ -1060,12 +1060,15 @@
 	++curImage;
 	_numFrames = curImage;
 	for (i = firstRoomObj; i <= lastRoomObj; ++i) {
-		int16 obj = _objectData[i].image;
-		if (obj > 5000) {
-			obj -= 5000;
-			GraphicData *pgd = &_graphicData[obj];
-			_graphics->bankUnpack(pgd->firstFrame, curImage, 15);
-			_graphics->bobPaste(curImage, pgd->x, pgd->y);
+		ObjectData *pod = &_objectData[i];
+		if (pod->name > 0) {
+			int16 obj = pod->image;
+			if (obj > 5000) {
+				obj -= 5000;
+				GraphicData *pgd = &_graphicData[obj];
+				_graphics->bankUnpack(pgd->firstFrame, curImage, 15);
+				_graphics->bobPaste(curImage, pgd->x, pgd->y);
+			}
 		}
 	}
 }





More information about the Scummvm-git-logs mailing list