aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/script_v0.cpp
diff options
context:
space:
mode:
authorTobias Gunkel2012-01-21 14:06:19 +0100
committerTobias Gunkel2012-02-11 08:29:03 +0100
commit2f1336cdf07b59c560d082a1ce3bb7986a3913df (patch)
treeced05afef77494f7c1e16384c8f0205db14a5c60 /engines/scumm/script_v0.cpp
parenta999aa39ba4963b8c31b1db81f73bdc04e9b4772 (diff)
downloadscummvm-rg350-2f1336cdf07b59c560d082a1ce3bb7986a3913df.tar.gz
scummvm-rg350-2f1336cdf07b59c560d082a1ce3bb7986a3913df.tar.bz2
scummvm-rg350-2f1336cdf07b59c560d082a1ce3bb7986a3913df.zip
SCUMM: fix blank sentence line in v0 after cutscenes and remove unused parameter of resetSentence()
Diffstat (limited to 'engines/scumm/script_v0.cpp')
-rw-r--r--engines/scumm/script_v0.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index e277480aed..7fce4011e4 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -453,6 +453,8 @@ void ScummEngine_v0::drawSentenceObject(int object) {
void ScummEngine_v0::drawSentenceLine() {
+ _redrawSentenceLine = false;
+
if (!(_userState & 32))
return;
@@ -601,7 +603,7 @@ void ScummEngine_v0::o_loadRoomWithEgo() {
_fullRedraw = true;
- resetSentence(false);
+ resetSentence();
if (x >= 0 && y >= 0) {
a->startWalkActor(x, y, -1);
@@ -625,6 +627,7 @@ void ScummEngine_v0::o_cursorCommand() {
_currentMode = fetchScriptByte();
switch (_currentMode) {
case kModeCutscene:
+ _redrawSentenceLine = false;
state = 15;
break;
case kModeKeypad:
@@ -909,7 +912,7 @@ void ScummEngine_v0::o_cutscene() {
setUserState(15);
_sentenceNum = 0;
- resetSentence(false);
+ resetSentence();
vm.cutScenePtr[0] = 0;
}
@@ -930,6 +933,8 @@ void ScummEngine_v0::o_endCutscene() {
} else if (vm.cutSceneData[2] != _currentRoom) {
startScene(vm.cutSceneData[2], 0, 0);
}
+
+ _redrawSentenceLine = true;
}
void ScummEngine_v0::o_beginOverride() {
@@ -961,11 +966,12 @@ void ScummEngine_v0::o_setOwnerOf() {
setOwnerOf(obj, owner);
}
-void ScummEngine_v0::resetSentence(bool walking) {
+void ScummEngine_v0::resetSentence() {
_activeVerb = kVerbWalkTo;
_activeObject = 0;
_activeObject2 = 0;
_walkToObjectIdx = 0;
+ _redrawSentenceLine = true;
}
} // End of namespace Scumm