aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorJoost Peters2003-10-17 10:51:07 +0000
committerJoost Peters2003-10-17 10:51:07 +0000
commite00848384a55f78c44c882b5fdb04526ef08cbaa (patch)
tree05c668c42e58ef48193a51a63893d8438aed1f46 /queen
parent3e68577bae45636be5c758d8c381a832655d9247 (diff)
downloadscummvm-rg350-e00848384a55f78c44c882b5fdb04526ef08cbaa.tar.gz
scummvm-rg350-e00848384a55f78c44c882b5fdb04526ef08cbaa.tar.bz2
scummvm-rg350-e00848384a55f78c44c882b5fdb04526ef08cbaa.zip
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?)
svn-id: r10851
Diffstat (limited to 'queen')
-rw-r--r--queen/cutaway.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp
index 754e6e1094..491ec6a75b 100644
--- a/queen/cutaway.cpp
+++ b/queen/cutaway.cpp
@@ -71,7 +71,7 @@ Cutaway::Cutaway(
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 @@ void Cutaway::handlePersonRecord(
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);