[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.352,1.353 script_v100he.cpp,2.150,2.151 script_v72he.cpp,2.288,2.289 script_v7he.cpp,2.152,2.153 wiz_he.cpp,2.80,2.81

[kirben]

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

Modified Files:
	actor.cpp script_v100he.cpp script_v72he.cpp script_v7he.cpp 
	wiz_he.cpp 
Log Message:

Avoid HE regressions.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -d -r1.352 -r1.353
--- actor.cpp	10 May 2005 15:43:40 -0000	1.352
+++ actor.cpp	12 May 2005 09:12:30 -0000	1.353
@@ -1488,7 +1488,8 @@
 
 	if (_vm->_heversion >= 71 && _vm->getTalkingActor() == _number) {
 		if (_vm->_heversion <= 95 || (_vm->_heversion >= 98 && _vm->VAR(_vm->VAR_SKIP_RESET_TALK_ACTOR) == 0)) {
-			_vm->setTalkingActor(0);
+			// TODO
+			// _vm->setTalkingActor(0);
 		}
 	}
 }

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.150
retrieving revision 2.151
diff -u -d -r2.150 -r2.151
--- script_v100he.cpp	10 May 2005 05:34:48 -0000	2.150
+++ script_v100he.cpp	12 May 2005 09:12:30 -0000	2.151
@@ -1101,11 +1101,10 @@
 		// Heap related
 		break;
 	case 136:
-		// Queue loading
 		if (_heResType == rtScript && _heResId >= _numGlobalScripts)
 			break;
 
-		ensureResourceLoaded(_heResType, _heResId);
+		//queueLoadResource(_heResType, _heResId);
 		break;
 	case 137:
 		if (_heResType == rtScript && _heResId >= _numGlobalScripts)
@@ -2229,7 +2228,7 @@
 		error("o100_isResourceLoaded: default case %d", subOp);
 	}
 
-	push (res.isResourceLoaded(type, idx) ? 100 : 0);
+	push(100);
 }
 
 void ScummEngine_v100he::o100_getResourceSize() {

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.288
retrieving revision 2.289
diff -u -d -r2.288 -r2.289
--- script_v72he.cpp	11 May 2005 21:32:58 -0000	2.288
+++ script_v72he.cpp	12 May 2005 09:12:30 -0000	2.289
@@ -2135,7 +2135,7 @@
 		error("o72_isResourceLoaded: default case %d", subOp);
 	}
 
-	push (res.isResourceLoaded(type, idx) ? 100 : 0);
+	push(100);
 }
 
 void ScummEngine_v72he::o72_readINI() {

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.152
retrieving revision 2.153
diff -u -d -r2.152 -r2.153
--- script_v7he.cpp	7 May 2005 08:10:23 -0000	2.152
+++ script_v7he.cpp	12 May 2005 09:12:30 -0000	2.153
@@ -603,31 +603,26 @@
 			break;
 		}
 	case 120:
-		// Queue load script
 		resid = pop();
 		if (resid >= _numGlobalScripts)
 			break;
-		ensureResourceLoaded(rtScript, resid);
+		//queueLoadResource(rtScript, resid);
 		break;
 	case 121:
-		// Queue load sound
 		resid = pop();
-		ensureResourceLoaded(rtSound, resid);
+		//queueLoadResource(rtSound, resid);
 		break;
 	case 122:
-		// Queue load costume
 		resid = pop();
-		ensureResourceLoaded(rtCostume, resid);
+		//queueLoadResource(rtCostume, resid);
 		break;
 	case 123:
-		// Queue load room image
 		resid = pop();
-		ensureResourceLoaded(rtRoomImage, resid);
+		//queueLoadResource(rtRoomImage, resid);
 		break;
 	case 203:
-		// Queue load image
 		resid = pop();
-		ensureResourceLoaded(rtImage, resid);
+		//queueLoadResource(rtImage, resid);
 		break;
 	case 159:
 		resid = pop();

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.80
retrieving revision 2.81
diff -u -d -r2.80 -r2.81
--- wiz_he.cpp	10 May 2005 22:56:14 -0000	2.80
+++ wiz_he.cpp	12 May 2005 09:12:30 -0000	2.81
@@ -982,8 +982,7 @@
 
 	const uint8 *xmap = NULL;
 	if (xmapNum) {
-		byte *xmapPtr = getResourceAddress(rtImage, xmapNum);
-		xmap = findResourceData(MKID('XMAP'), xmapPtr);
+		// TODO: Handle 'XMAP' data for shadows
 	}
 
 	uint8 *dataPtr = getResourceAddress(rtImage, resNum);
@@ -1062,7 +1061,6 @@
 		}
 	}
 
-	// XXX handle 'XMAP' data
 	if (xmap) {
 		palPtr = xmap;
 	}