aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/verbs.cpp
diff options
context:
space:
mode:
authorMax Horn2011-02-07 17:53:34 +0000
committerMax Horn2011-02-07 17:53:34 +0000
commit2c00aed172f09285c8131d437b64de9d000d1762 (patch)
tree9910452de9d90b4f39d3edcaa00ce9ed35d3e84e /engines/scumm/verbs.cpp
parent57c932abddfbd0201daac2a034ec179f8351a54b (diff)
downloadscummvm-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/verbs.cpp')
-rw-r--r--engines/scumm/verbs.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index c443f98bc6..e8f75dd901 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -852,7 +852,7 @@ bool ScummEngine_v0::verbObtain(int obj, int objIndex) {
if (whereIsObject(obj) == WIO_INVENTORY)
_activeInventory = obj;
else
- resetSentence();
+ resetSentence(false);
_v0ObjectInInventory = false;
}
@@ -889,7 +889,7 @@ bool ScummEngine_v0::verbExec() {
int entry = (_currentMode != 0 && _currentMode != 1) ? _activeVerb : 15;
if ((!_activeInvExecute && _activeObject && getObjectIndex(_activeObject) == -1)) {
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -940,7 +940,7 @@ bool ScummEngine_v0::verbExec() {
runObject(_activeInventory , 3);
_v0ObjectInInventory = false;
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -951,7 +951,7 @@ bool ScummEngine_v0::verbExec() {
_v0ObjectIndex = false;
_verbExecuting = false;
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -965,7 +965,7 @@ bool ScummEngine_v0::verbExec() {
if ((_currentMode == 3 || _currentMode == 2) && _activeVerb == 13)
return false;
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -982,7 +982,7 @@ bool ScummEngine_v0::verbExec() {
return false;
}
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -1025,7 +1025,7 @@ bool ScummEngine_v0::verbExec() {
return false;
}
- resetSentence();
+ resetSentence(false);
return false;
}
@@ -1175,7 +1175,7 @@ void ScummEngine_v0::checkExecVerbs() {
// Clicked on nothing, walk here?
if (!over && !act && _activeVerb == 13 && !obj && _currentMode != 0) {
// Clear all selected
- resetSentence();
+ resetSentence(false);
// 0xB31
VAR(6) = _virtualMouse.x / V12_X_MULTIPLIER;
@@ -1206,7 +1206,7 @@ void ScummEngine_v0::checkExecVerbs() {
if (_activeVerb != over) {
_activeVerb = over;
if (_activeVerb == 13) {
- resetSentence();
+ resetSentence(false);
}
return;
}