diff options
| author | Gregory Montoir | 2003-11-26 20:40:43 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2003-11-26 20:40:43 +0000 |
| commit | 871c4f8342ed4063a18a5ed4cb1f2e8b78b9dee2 (patch) | |
| tree | 5950ff38f2760c56bf2199573e6f483973eb7d4e /queen/cutaway.cpp | |
| parent | a5d8cacdad4930a12e380ddaaf1b6a9108efae87 (diff) | |
| download | scummvm-rg350-871c4f8342ed4063a18a5ed4cb1f2e8b78b9dee2.tar.gz scummvm-rg350-871c4f8342ed4063a18a5ed4cb1f2e8b78b9dee2.tar.bz2 scummvm-rg350-871c4f8342ed4063a18a5ed4cb1f2e8b78b9dee2.zip | |
rename some methods (purely cosmetic) and fix some walking problems when closing Journal screen
svn-id: r11373
Diffstat (limited to 'queen/cutaway.cpp')
| -rw-r--r-- | queen/cutaway.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp index 8592f2b54e..15d0a831c1 100644 --- a/queen/cutaway.cpp +++ b/queen/cutaway.cpp @@ -1129,7 +1129,7 @@ void Cutaway::handlePersonRecord( if (object.objectNumber == OBJECT_JOE) { if (object.moveToX || object.moveToY) { - _walk->joeMove(0, object.moveToX, object.moveToY, true); + _walk->moveJoe(0, object.moveToX, object.moveToY, true); } } else { @@ -1145,7 +1145,7 @@ void Cutaway::handlePersonRecord( } if (object.moveToX || object.moveToY) - _walk->personMove( + _walk->movePerson( &p, object.moveToX, object.moveToY, _currentImage + 1, // XXX CI+1 @@ -1181,6 +1181,7 @@ void Cutaway::handlePersonRecord( char voiceFilePrefix[MAX_STRING_SIZE]; findCdCut(_basename, index, voiceFilePrefix); + Talk::speak(sentence, (object.objectNumber == OBJECT_JOE) ? NULL : &p, voiceFilePrefix, _graphics, _input, _logic, _resource, _sound); } |