[Scummvm-cvs-logs] CVS: scummvm/queen cutaway.cpp,1.26,1.27
Joost Peters
joostp at users.sourceforge.net
Fri Oct 17 03:59:09 CEST 2003
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv760/queen
Modified Files:
cutaway.cpp
Log Message:
fixed crash (atleast it crashes for me on OSX) - can someone please verify if this is a proper fix (and doesn't break anything else?)
Index: cutaway.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/cutaway.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- cutaway.cpp 17 Oct 2003 07:16:36 -0000 1.26
+++ cutaway.cpp 17 Oct 2003 10:51:07 -0000 1.27
@@ -71,7 +71,7 @@
Logic *logic,
Resource *resource)
: _graphics(graphics), _logic(logic), _resource(resource), _walk(logic->walk()),
- _quit(false), _personFaceCount(0), _lastSong(0), _songBeforeComic(0) {
+ _quit(false), _personFaceCount(0), _personDataCount(0), _lastSong(0), _songBeforeComic(0) {
memset(&_bankNames, 0, sizeof(_bankNames));
load(filename);
}
@@ -632,6 +632,8 @@
Person p;
+ _personFaceCount = 0; //Hello, please verify me. (Fixes crash on OSX)
+
if (object.objectNumber == OBJECT_JOE) {
if (object.moveToX || object.moveToY) {
_walk->joeMove(0, object.moveToX, object.moveToY, true);
More information about the Scummvm-git-logs
mailing list