Some more small fixes. Gob3 is completable now :)

svn-id: r26556

1 files changed, 11 insertions, 0 deletions

diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp
index d973ea4c22..8b158ab314 100644
--- a/engines/gob/mult_v2.cpp
+++ b/engines/gob/mult_v2.cpp
@@ -227,6 +227,13 @@ void Mult_v2::loadMult(int16 resId) {
 		case 3:
 			_vm->_global->_inter_execPtr += 4;
 			break;
+
+		case -1:
+			break;
+
+		default:
+			warning("Mult_v2::loadMult(): Unknown sound key command (%d)",
+					_multData->sndKeys[i].cmd);
 		}
 	}
 	
@@ -1185,6 +1192,8 @@ void Mult_v2::advanceObjects(int16 index) {
 }
 
 void Mult_v2::advanceAllObjects() {
+	Mult_Data *multData = _multData;
+
 	for (int i = 0; i < 8; i++) {
 		if (_multDatas[i]) {
 			_multData = _multDatas[i];
@@ -1192,6 +1201,8 @@ void Mult_v2::advanceAllObjects() {
 				advanceObjects(j);
 		}
 	}
+
+	_multData = multData;
 }
 
 } // End of namespace Gob