[Scummvm-cvs-logs] SF.net SVN: scummvm: [21522] scummvm/trunk/engines/scumm/he

kirben at users.sourceforge.net kirben at users.sourceforge.net
Fri Mar 31 22:39:04 CEST 2006


Revision: 21522
Author:   kirben
Date:     2006-03-31 22:38:47 -0800 (Fri, 31 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21522&view=rev

Log Message:
-----------
Fix painting and fridge magnet palette glitches in thinker1

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/script_v90he.cpp
    scummvm/trunk/engines/scumm/he/wiz_he.cpp
Modified: scummvm/trunk/engines/scumm/he/script_v90he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/script_v90he.cpp	2006-03-31 23:51:19 UTC (rev 21521)
+++ scummvm/trunk/engines/scumm/he/script_v90he.cpp	2006-04-01 06:38:47 UTC (rev 21522)
@@ -689,12 +689,11 @@
 		_wizParams.processMode = 6;
 		if (_wizParams.remapNum == 0) {
 			memset(_wizParams.remapIndex, 0, sizeof(_wizParams.remapIndex));
-		} else {
-			assert(_wizParams.remapNum < ARRAYSIZE(_wizParams.remapIndex));
-			_wizParams.remapIndex[_wizParams.remapNum] = a;
-			_wizParams.remapColor[a] = b;
-			++_wizParams.remapNum;
 		}
+		assert(_wizParams.remapNum < ARRAYSIZE(_wizParams.remapIndex));
+		_wizParams.remapIndex[_wizParams.remapNum] = a;
+		_wizParams.remapColor[a] = b;
+		_wizParams.remapNum++;
 		break;
 	case 21:
 		_wizParams.processFlags |= kWPFClipBox;

Modified: scummvm/trunk/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.cpp	2006-03-31 23:51:19 UTC (rev 21521)
+++ scummvm/trunk/engines/scumm/he/wiz_he.cpp	2006-04-01 06:38:47 UTC (rev 21522)
@@ -1957,9 +1957,7 @@
 		}
 		break;
 	case 6:
-		if (params->processFlags & kWPFRemapPalette) {
-			remapWizImagePal(params);
-		}
+		remapWizImagePal(params);
 		break;
 	// HE 99+
 	case 7:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list