[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.379.2.4,1.379.2.5 resource_v7he.cpp,1.46.2.1,1.46.2.2

[kirben]

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

Modified Files:
      Tag: branch-0-8-0
	actor.cpp resource_v7he.cpp 
Log Message:

Last minute fix.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.379.2.4
retrieving revision 1.379.2.5
diff -u -d -r1.379.2.4 -r1.379.2.5
--- actor.cpp	22 Oct 2005 04:12:08 -0000	1.379.2.4
+++ actor.cpp	29 Oct 2005 01:04:29 -0000	1.379.2.5
@@ -1107,18 +1107,19 @@
 	bcr->_shadow_mode = _shadowMode;
 	if (_vm->_features & GF_SMALL_HEADER) {
 		bcr->_shadow_table = NULL;
+#ifndef DISABLE_HE
 	} else if (_vm->_heversion >= 95 && _heXmapNum) {
-		byte shadow_table[65536];
 		const uint8 *dataPtr = _vm->getResourceAddress(rtImage, _heXmapNum);
 		assert(dataPtr);
 		const uint8 *xmapPtr = _vm->findResourceData(MKID('XMAP'), dataPtr);
 		assert(xmapPtr);
 		int32 size = _vm->getResourceDataSize(xmapPtr);
 		assert(size == 65536);
-		memcpy(shadow_table, xmapPtr, size);
-		bcr->_shadow_table = shadow_table;
+		memcpy(_vm->_shadowPalette, xmapPtr, size);
+		bcr->_shadow_table = _vm->_shadowPalette;
 	} else if (_vm->_heversion == 70) {
 		bcr->_shadow_table = _vm->_HEV7ActorPalette;
+#endif
 	} else {
 		bcr->_shadow_table = _vm->_shadowPalette;
 	}

Index: resource_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v7he.cpp,v
retrieving revision 1.46.2.1
retrieving revision 1.46.2.2
diff -u -d -r1.46.2.1 -r1.46.2.2
--- resource_v7he.cpp	18 Oct 2005 02:11:21 -0000	1.46.2.1
+++ resource_v7he.cpp	29 Oct 2005 01:04:29 -0000	1.46.2.2
@@ -1720,6 +1720,11 @@
 		_numGlobalScripts = 2048;
 	else
 		_numGlobalScripts = 200;
+
+	if (_heversion >= 95) {
+		_shadowPalette = (byte *)calloc(65536, 1);
+	}
+
 }
 
 void ScummEngine_v72he::readMAXS(int blockSize) {