From d8b435917d5cc00ad2b4817c5eabc828439e36f3 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sat, 7 Jan 2012 20:25:01 +0100
Subject: SCUMM: mm c64 cleanup

---
 engines/scumm/script_v0.cpp | 8 ++++----
 engines/scumm/scumm_v0.h    | 5 ++---
 engines/scumm/verbs.cpp     | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/engines/scumm/script_v0.cpp b/engines/scumm/script_v0.cpp
index 31363ed140..9b39391246 100644
--- a/engines/scumm/script_v0.cpp
+++ b/engines/scumm/script_v0.cpp
@@ -406,9 +406,9 @@ void ScummEngine_v0::decodeParseString() {
 	actorTalk(buffer);
 }
 
-void ScummEngine_v0::drawSentenceObject(int object, int type) {
+void ScummEngine_v0::drawSentenceObject(int object) {
 	const byte *temp;
-	temp = getObjOrActorName(OBJECT_V0(object, type));
+	temp = getObjOrActorName(object);
 	if (temp) {
 		_sentenceBuf += " ";
 		_sentenceBuf += (const char *)temp;
@@ -432,7 +432,7 @@ void ScummEngine_v0::drawSentence() {
 
 	if (_activeObjectNr) {
 		// Draw the 1st active object
-		drawSentenceObject(_activeObjectNr, _activeObjectType);
+		drawSentenceObject(OBJECT_V0(_activeObjectNr, _activeObjectType));
 
 		// Append verb preposition
 		int sentencePrep = activeVerbPrep();
@@ -448,7 +448,7 @@ void ScummEngine_v0::drawSentence() {
 					_sentenceBuf += (const char *)a->getActorName();
 				// 2nd Object is an inventory or room object
 				} else {
-					drawSentenceObject(_activeObject2Nr, _activeObject2Type);
+					drawSentenceObject(OBJECT_V0(_activeObject2Nr, _activeObject2Type));
 				}
 			}
 		}
diff --git a/engines/scumm/scumm_v0.h b/engines/scumm/scumm_v0.h
index 2c8c1c85c5..9b38b108e2 100644
--- a/engines/scumm/scumm_v0.h
+++ b/engines/scumm/scumm_v0.h
@@ -89,10 +89,9 @@ protected:
 	// V0 MM Verb commands
 	int getVerbPrepId();
 	int activeVerbPrep();
-	bool verbMove(int object, bool invObject);
+	bool verbMove(int object);
 	bool verbMoveToActor(int actor);
 	bool verbObtain(int object);
-	bool verbExecutes(int object, bool inventory = false);
 	bool verbExec();
 
 	virtual void checkExecVerbs();
@@ -101,7 +100,7 @@ protected:
 	void resetVerbs();
 	void setNewKidVerbs();
 
-	void drawSentenceObject(int object, int type);
+	void drawSentenceObject(int object);
 	void drawSentence();
 
 	void switchActor(int slot);
diff --git a/engines/scumm/verbs.cpp b/engines/scumm/verbs.cpp
index 03acdda1a8..016248c530 100644
--- a/engines/scumm/verbs.cpp
+++ b/engines/scumm/verbs.cpp
@@ -762,7 +762,7 @@ bool ScummEngine_v0::verbMoveToActor(int actor) {
 	return true;
 }
 
-bool ScummEngine_v0::verbMove(int object, bool invObject) {
+bool ScummEngine_v0::verbMove(int object) {
 	int x, y, dir;
 	Actor *a = derefActor(VAR(VAR_EGO), "verbMove");
 
@@ -835,7 +835,7 @@ bool ScummEngine_v0::verbObtain(int obj) {
 		}
 
 		//attempt move to object
-		if (verbMove(obj, false))
+		if (verbMove(obj))
 			return true;
 
 		if (didPickup && (prep == kVerbPrepIn || prep == kVerbPrepTo))
-- 
cgit v1.2.3