[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.273,1.274

kirben kirben at users.sourceforge.net
Fri Mar 18 16:16:37 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25421/scumm

Modified Files:
	script_v5.cpp 
Log Message:

Fix original load/save screen freezing in Loom [ega]
Sets current drive, instead of drive type.


Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -d -r1.273 -r1.274
--- script_v5.cpp	18 Mar 2005 15:04:11 -0000	1.273
+++ script_v5.cpp	19 Mar 2005 00:15:55 -0000	1.274
@@ -1138,17 +1138,23 @@
 			_opcode = 0x40;
 		else if (a == 2)
 			_opcode = 0x80;
-	} else
+	} else {
 		_opcode = a & 0xE0;
+	}
 
 	switch (_opcode) {
 	case 0x00: // num slots available
 		result = 100;
 		break;
 	case 0x20: // drive
-		// 0 = hard drive
-		// 1 = disk drive
-		result = 0;
+		if (_gameId == GID_INDY3) {
+			// 0 = hard drive
+			// 1 = disk drive
+			result = 0;
+		} else {
+			// set current drive
+			result = 1;
+		}
 		break;
 	case 0x40: // load
 		if (loadState(slot, _saveTemporaryState))
@@ -1173,7 +1179,10 @@
 		else
 			result = 7; // save file does not exist
 		break;
+	default:
+		error("o5_saveLoadGame: unknown subopcode %d", _opcode);
 	}
+
 	setResult(result);
 }
 		





More information about the Scummvm-git-logs mailing list