diff options
author | Willem Jan Palenstijn | 2012-02-13 20:26:43 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2012-02-13 20:26:43 +0100 |
commit | 3f5aaa0ca5b77d3e766d5eb8ea51085f072db701 (patch) | |
tree | e9bda57b4fa9f40a71607cdbb2e643c8123a5152 /engines | |
parent | 7da29858e7b582f6914e0cc4f4e2938cb425a49e (diff) | |
download | scummvm-rg350-3f5aaa0ca5b77d3e766d5eb8ea51085f072db701.tar.gz scummvm-rg350-3f5aaa0ca5b77d3e766d5eb8ea51085f072db701.tar.bz2 scummvm-rg350-3f5aaa0ca5b77d3e766d5eb8ea51085f072db701.zip |
SCUMM: Clean up resetSentence
Diffstat (limited to 'engines')
-rw-r--r-- | engines/scumm/script_v2.cpp | 8 | ||||
-rw-r--r-- | engines/scumm/scumm_v2.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 9c8742cffd..ce162b4a6a 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -873,7 +873,7 @@ void ScummEngine_v2::o2_doSentence() { return; } if (a == 0xFB) { - resetSentence(false); + resetSentence(); return; } @@ -1411,7 +1411,7 @@ void ScummEngine_v2::o2_loadRoomWithEgo() { _fullRedraw = true; - resetSentence(false); + resetSentence(); if (x >= 0 && y >= 0) { a->startWalkActor(x, y, -1); @@ -1492,7 +1492,7 @@ void ScummEngine_v2::o2_cutscene() { _sentenceNum = 0; stopScript(SENTENCE_SCRIPT); - resetSentence(false); + resetSentence(); vm.cutScenePtr[0] = 0; } @@ -1640,7 +1640,7 @@ void ScummEngine_v2::o2_switchCostumeSet() { o2_dummy(); } -void ScummEngine_v2::resetSentence(bool walking) { +void ScummEngine_v2::resetSentence() { VAR(VAR_SENTENCE_VERB) = VAR(VAR_BACKUP_VERB); VAR(VAR_SENTENCE_OBJECT1) = 0; VAR(VAR_SENTENCE_OBJECT2) = 0; diff --git a/engines/scumm/scumm_v2.h b/engines/scumm/scumm_v2.h index b407fd3f8a..316a08d325 100644 --- a/engines/scumm/scumm_v2.h +++ b/engines/scumm/scumm_v2.h @@ -87,7 +87,7 @@ protected: void clearStateCommon(byte type); void stopScriptCommon(int script); - virtual void resetSentence(bool walking); + void resetSentence(); void setUserState(byte state); virtual void handleMouseOver(bool updateInventory); |