SCUMM: start handling object type and id correctly in mm c64

- removed complicated and unnecessary _v0ObjectIndex, _v0ObjectInInventory, _v0ObjectFlag vars
- started to merge object id and type into one object value (type<<8|id)
- verb preposition ids do not dependent on language -> remove from VerbSettings

Note:
- objects with type=0 are foreground objects. They have a state, an owner and a bg overlay image.
- objects with type=1 are bg objects. They do not have a state or owner and are already contained in the bg image. The do not have an entry in objectState/OwnerTable

1 files changed, 4 insertions, 7 deletions

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index d3dc702395..423ad79b00 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -151,9 +151,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 	_fileHandle = 0;
 
 	// Init all vars
-	_v0ObjectIndex = false;
-	_v0ObjectInInventory = false;
-	_v0ObjectFlag = 0;
 	_imuse = NULL;
 	_imuseDigital = NULL;
 	_musicEngine = NULL;
@@ -720,10 +717,10 @@ ScummEngine_v0::ScummEngine_v0(OSystem *syst, const DetectorResult &dr)
 	_currentMode = 0;
 
 	_activeVerb = 0;
-	_activeObject = 0;
-	_activeObject2 = 0;
-	_activeObjectType = kObjectTypeRoom;
-	_activeObject2Type = kObjectTypeRoom;
+	_activeObjectNr = 0;
+	_activeObject2Nr = 0;
+	_activeObjectType = kObjectTypeBG;
+	_activeObject2Type = kObjectTypeBG;
 	_activeObjectObtained = false;
 	_activeObject2Obtained = false;