SCUMM: Avoid hiding overloaded virtual method

svn-id: r55809

6 files changed, 18 insertions, 18 deletions

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index d3f256c951..7c3964a326 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -664,7 +664,7 @@ void ScummEngine_v0::o_loadRoomWithEgo() {
 
 	_fullRedraw = true;
 
-	resetSentence();
+	resetSentence(false);
 
 	if (x >= 0 && y >= 0) {
 		a->startWalkActor(x, y, -1);
@@ -934,7 +934,7 @@ void ScummEngine_v0::o_cutscene() {
 	setUserState(15);
 
 	_sentenceNum = 0;
-	resetSentence();
+	resetSentence(false);
 
 	vm.cutScenePtr[0] = 0;
 }
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;
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 7b913f7750..9ffb19a959 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -95,7 +95,7 @@ protected:
 
 	virtual int getActiveObject();
 
-	virtual void resetSentence(bool walking = false);
+	virtual void resetSentence(bool walking);
 
 	virtual bool areBoxesNeighbours(int box1nr, int box2nr);
 
diff --git a/engines/scumm/scumm_v2.h b/engines/scumm/scumm_v2.h
index 0c54308181..687ccd6ab3 100644
--- a/engines/scumm/scumm_v2.h
+++ b/engines/scumm/scumm_v2.h
@@ -93,7 +93,7 @@ protected:
 	void setStateCommon(byte type);
 	void clearStateCommon(byte type);
 
-	virtual void resetSentence();
+	virtual void resetSentence(bool walking);
 	void setUserState(byte state);
 
 	virtual void handleMouseOver(bool updateInventory);
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index 9b8aa1ca82..48fe0a20ed 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -546,7 +546,7 @@ void ScummEngine_v8::setupScummVars() {
 #endif
 
 void ScummEngine_v0::resetScummVars() {
-	resetSentence();
+	resetSentence(false);
 
 	VAR(VAR_EGO) = 3;
 
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;
 			}