diff options
| author | Max Horn | 2011-02-07 17:53:34 +0000 |
|---|---|---|
| committer | Max Horn | 2011-02-07 17:53:34 +0000 |
| commit | 2c00aed172f09285c8131d437b64de9d000d1762 (patch) | |
| tree | 9910452de9d90b4f39d3edcaa00ce9ed35d3e84e /engines/scumm/script_v2.cpp | |
| parent | 57c932abddfbd0201daac2a034ec179f8351a54b (diff) | |
| download | scummvm-rg350-2c00aed172f09285c8131d437b64de9d000d1762.tar.gz scummvm-rg350-2c00aed172f09285c8131d437b64de9d000d1762.tar.bz2 scummvm-rg350-2c00aed172f09285c8131d437b64de9d000d1762.zip | |
SCUMM: Avoid hiding overloaded virtual method
svn-id: r55809
Diffstat (limited to 'engines/scumm/script_v2.cpp')
| -rw-r--r-- | engines/scumm/script_v2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 2104680d8e..d7ff8950f8 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -875,7 +875,7 @@ void ScummEngine_v2::o2_doSentence() { return; } if (a == 0xFB) { - resetSentence(); + resetSentence(false); return; } @@ -1398,7 +1398,7 @@ void ScummEngine_v2::o2_loadRoomWithEgo() { _fullRedraw = true; - resetSentence(); + resetSentence(false); if (x >= 0 && y >= 0) { a->startWalkActor(x, y, -1); @@ -1477,7 +1477,7 @@ void ScummEngine_v2::o2_cutscene() { _sentenceNum = 0; stopScript(SENTENCE_SCRIPT); - resetSentence(); + resetSentence(false); vm.cutScenePtr[0] = 0; } @@ -1625,7 +1625,7 @@ void ScummEngine_v2::o2_switchCostumeSet() { o2_dummy(); } -void ScummEngine_v2::resetSentence() { +void ScummEngine_v2::resetSentence(bool walking) { VAR(VAR_SENTENCE_VERB) = VAR(VAR_BACKUP_VERB); VAR(VAR_SENTENCE_OBJECT1) = 0; VAR(VAR_SENTENCE_OBJECT2) = 0; |