[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen logic.h,1.66,1.67 logic.cpp,1.95,1.96 cutaway.cpp,1.65,1.66 talk.cpp,1.41,1.42 display.h,1.19,1.20 display.cpp,1.26,1.27
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.44,1.45 console.cpp,1.33,1.34 controls.cpp,1.49,1.50 debug.cpp,1.29,1.30 events.cpp,1.20,1.21 icons.cpp,1.25,1.26 logic.cpp,1.31,1.32 logic.h,1.19,1.20 mouse.cpp,1.42,1.43 resman.cpp,1.70,1.71 save_rest.cpp,1.38,1.39 startup.cpp,1.32,1.33 sword2.cpp,1.84,1.85 sword2.h,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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);
+ }
}
}
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen logic.h,1.66,1.67 logic.cpp,1.95,1.96 cutaway.cpp,1.65,1.66 talk.cpp,1.41,1.42 display.h,1.19,1.20 display.cpp,1.26,1.27
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.44,1.45 console.cpp,1.33,1.34 controls.cpp,1.49,1.50 debug.cpp,1.29,1.30 events.cpp,1.20,1.21 icons.cpp,1.25,1.26 logic.cpp,1.31,1.32 logic.h,1.19,1.20 mouse.cpp,1.42,1.43 resman.cpp,1.70,1.71 save_rest.cpp,1.38,1.39 startup.cpp,1.32,1.33 sword2.cpp,1.84,1.85 sword2.h,1.40,1.41
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list