[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.102,1.103 command.cpp,1.21,1.22
Gregory Montoir
cyx at users.sourceforge.net
Thu Nov 20 01:40:03 CET 2003
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv1855
Modified Files:
logic.cpp command.cpp
Log Message:
fix 'gorilla becoming invisible' issue (this was due to the missing CLEAR_COMMAND call in SPEAK/TALK ; for now, added a Command::clear before each 'sensible' Talk::* call)
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- logic.cpp 16 Nov 2003 19:55:04 -0000 1.102
+++ logic.cpp 20 Nov 2003 09:38:54 -0000 1.103
@@ -1341,6 +1341,12 @@
// person is not standing in the area box, scale it accordingly
scale = currentRoomArea(a)->calcScale(pad->y);
}
+
+ if (noun == 0) {
+ warning("Trying to setup person 0");
+ return curImage;
+ }
+
_graphics->bankUnpack(pad->bobFrameStanding, p.bobFrame, p.bankNum);
bool xflip = false;
uint16 person = _roomData[_currentRoom] + noun;
@@ -1851,6 +1857,7 @@
cutaway = cutawayFile;
}
_display->fullscreen(true);
+ _cmd->clear(false);
Talk::talk(dlgFile, personInRoom, cutaway, _graphics, _input, this, _resource, _sound);
_display->fullscreen(false);
}
@@ -1874,6 +1881,7 @@
if (objectType) {
descNum += JOE_RESPONSE_MAX;
}
+ _cmd->clear(false);
char descFilePrefix[10];
sprintf(descFilePrefix, "JOE%04i", descNum);
Talk::speak(text, NULL, descFilePrefix, _graphics, _input, this, _resource, _sound);
Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- command.cpp 16 Nov 2003 14:12:53 -0000 1.21
+++ command.cpp 20 Nov 2003 09:38:54 -0000 1.22
@@ -1295,6 +1295,8 @@
uint16 dstObj = ABS(cmdObj->dstObj);
ObjectData *objData = _logic->objectData(dstObj);
+ debug(0, "Command::setObjects() - dstObj=%X srcObj=%X", cmdObj->dstObj, cmdObj->srcObj);
+
if (cmdObj->dstObj > 0) {
// show the object
objData->name = ABS(objData->name);
More information about the Scummvm-git-logs
mailing list