Partialy fixed Indy3 intro

svn-id: r3586

4 files changed, 10 insertions, 11 deletions

diff --git a/boxes.cpp b/boxes.cpp
index 873dd78071..99b96bdb0b 100644
--- a/boxes.cpp
+++ b/boxes.cpp
@@ -463,6 +463,7 @@ int Scumm::findPathTowards(Actor *a, byte box1nr, byte box2nr, byte box3nr) {
 		box2.lr = tmp;
 	}
 	warning("findPathTowards: default"); // FIXME: ZAK256
+	return 0;
 }
 void Scumm::setBoxFlags(int box, int val) {
 	/* FULL_THROTTLE stuff */
diff --git a/resource.cpp b/resource.cpp
index 35d52f65b0..4e499e5bf5 100644
--- a/resource.cpp
+++ b/resource.cpp
@@ -419,8 +419,8 @@ void Scumm::readIndexFileSmall() {
                                _classData[i] = fileReadByte() + 256*fileReadByte()+ 256*256*fileReadByte();
                      //          fileReadByte();
                                _objectOwnerTable[i] = fileReadByte();
-                     //          _objectStateTable[i] = _objectOwnerTable[i]>>OF_STATE_SHL;
-                     //          _objectOwnerTable[i] &= OF_OWNER_MASK;
+                               _objectStateTable[i] = _objectOwnerTable[i]>>OF_STATE_SHL;
+                               _objectOwnerTable[i] &= OF_OWNER_MASK;
                        }
                
 #if defined(SCUMM_BIG_ENDIAN)
diff --git a/script_v1.cpp b/script_v1.cpp
index 818cc97d19..06cf35f595 100644
--- a/script_v1.cpp
+++ b/script_v1.cpp
@@ -28,7 +28,7 @@ void Scumm::setupOpcodes() {
 	/* 00 */
 	&Scumm::o5_stopObjectCode,
 	&Scumm::o5_putActor,
-	&Scumm::o5_startMusic,
+	&Scumm::o5_tartMusic,
 	&Scumm::o5_getActorRoom,
 	/* 04 */
 	&Scumm::o5_isGreaterEqual,
@@ -1684,12 +1684,6 @@ void Scumm::o5_startObject() {
 	obj = getVarOrDirectWord(0x80);
 	script = getVarOrDirectByte(0x40);
 
-	if(_gameId == GID_INDY3_256) /*FIXME*/
-	{
-		fetchScriptByte();
-		return;
-	}
-	
 	getWordVararg(data);
 	runVerbCode(obj, script, 0, 0, data);
 }
@@ -2140,9 +2134,10 @@ void Scumm::o5_pickupObjectOld() {
 
 	if(getObjectIndex(obj) != 1)
 		return;
-
+	
+	addObjectToInventory(obj,_currentRoom);	/*FIXME: the implementation is not quite acurate */
 
 	
-	warning("Unsupported pickupObjectOld");
+	warning("pickupObjectOld(%d) not fully supported",obj);
 
 }
diff --git a/sound.cpp b/sound.cpp
index 3c47089790..cc7fd3bca5 100644
--- a/sound.cpp
+++ b/sound.cpp
@@ -29,6 +29,9 @@ void Scumm::addSoundToQueue(int sound) {
 	ensureResourceLoaded(rtSound, sound);
 	addSoundToQueue2(sound);
 #endif
+	
+	if(_features & GF_AUDIOTRACKS)
+		warning("Requesting audio track: %d",sound);
 }
 
 void Scumm::addSoundToQueue2(int sound) {