[Scummvm-cvs-logs] CVS: scummvm/scumm script_v7he.cpp,2.140,2.141 script_v8.cpp,2.287,2.288

kirben kirben at users.sourceforge.net
Sat Apr 9 02:58:48 CEST 2005


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

Modified Files:
	script_v7he.cpp script_v8.cpp 
Log Message:

Add flObject lock/unlock support for HE games.


Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.140
retrieving revision 2.141
diff -u -d -r2.140 -r2.141
--- script_v7he.cpp	8 Apr 2005 11:10:01 -0000	2.140
+++ script_v7he.cpp	9 Apr 2005 09:57:54 -0000	2.141
@@ -510,10 +510,11 @@
 }
 
 void ScummEngine_v70he::o70_resourceRoutines() {
-	int resid, op;
-	op = fetchScriptByte();
+	int objidx, resid, subOp;
 
-	switch (op) {
+	subOp = fetchScriptByte();
+
+	switch (subOp) {
 	case 100:		// SO_LOAD_SCRIPT
 		resid = pop();
 		ensureResourceLoaded(rtScript, resid);
@@ -607,7 +608,7 @@
 	case 122:
 	case 123:
 	case 203:
-		debug(5,"stub queueload (%d) resource %d", op, pop());
+		debug(5,"stub queueload (%d) resource %d", subOp, pop());
 		break;
 	case 159:
 		resid = pop();
@@ -627,17 +628,25 @@
 		break;
 	case 233:
 		resid = pop();
-		debug(5,"stub o70_resourceRoutines lock object %d", resid);
+		objidx = getObjectIndex(resid);
+		if (objidx == -1)
+			break;
+		res.lock(rtFlObject, _objs[objidx].fl_object_index);
+		debug(0,"stub o70_resourceRoutines lock object %d", resid);
 		break;
 	case 235:
 		resid = pop();
-		debug(5,"stub o70_resourceRoutines unlock object %d", resid);
+		objidx = getObjectIndex(resid);
+		if (objidx == -1)
+			break;
+		res.unlock(rtFlObject, _objs[objidx].fl_object_index);
+		debug(0,"stub o70_resourceRoutines unlock object %d", resid);
 		break;
 	case 239:
 		// Used in airport
 		break;
 	default:
-		debug(1,"o70_resourceRoutines: default case %d", op);
+		debug(1,"o70_resourceRoutines: default case %d", subOp);
 	}
 }
 

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.287
retrieving revision 2.288
diff -u -d -r2.287 -r2.288
--- script_v8.cpp	1 Apr 2005 09:55:17 -0000	2.287
+++ script_v8.cpp	9 Apr 2005 09:57:54 -0000	2.288
@@ -1214,13 +1214,13 @@
 	case 11: {	// lockObject
 		int objidx = getObjectIndex(args[1]);
 		assert(objidx != -1);
-		res.lock(rtFlObject, objidx);
+		res.lock(rtFlObject, _objs[objidx].fl_object_index);
 		break;
 	}
 	case 12: {	// unlockObject
 		int objidx = getObjectIndex(args[1]);
 		assert(objidx != -1);
-		res.unlock(rtFlObject, objidx);
+		res.unlock(rtFlObject, _objs[objidx].fl_object_index);
 		break;
 	}
 	case 13:	// remapCostume





More information about the Scummvm-git-logs mailing list