[Scummvm-cvs-logs] SF.net SVN: scummvm: [24110] scummvm/trunk/engines/agos

[kirben at users.sourceforge.net]

Revision: 24110
          http://svn.sourceforge.net/scummvm/?rev=24110&view=rev
Author:   kirben
Date:     2006-10-04 04:44:59 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
Fix palette regression

Modified Paths:
--------------
    scummvm/trunk/engines/agos/game.cpp
    scummvm/trunk/engines/agos/vga.cpp

Modified: scummvm/trunk/engines/agos/game.cpp
===================================================================
--- scummvm/trunk/engines/agos/game.cpp	2006-10-04 11:17:00 UTC (rev 24109)
+++ scummvm/trunk/engines/agos/game.cpp	2006-10-04 11:44:59 UTC (rev 24110)
@@ -703,7 +703,7 @@
 			"Floppy",
 			ARRAYSIZE(ELVIRA2DOS_FR_GameFiles),
 			ELVIRA2DOS_FR_GameFiles,
-			Common::EN_ANY,
+			Common::FR_FRA,
 			Common::kPlatformPC,
 		},
 

Modified: scummvm/trunk/engines/agos/vga.cpp
===================================================================
--- scummvm/trunk/engines/agos/vga.cpp	2006-10-04 11:17:00 UTC (rev 24109)
+++ scummvm/trunk/engines/agos/vga.cpp	2006-10-04 11:44:59 UTC (rev 24110)
@@ -1765,16 +1765,18 @@
 		palptr = &_displayPalette[(a * 64)];
 		offs = _curVgaFile1 + 6;
 	} else {
+		num = 16;
 		palSize = 32;
 
 		palptr = _displayPalette;
 		offs = _curVgaFile1 + READ_BE_UINT16(_curVgaFile1 + 6);
 
-		if (b >= 1000) {
-			b -= 1000;
-			num = 16;
-		} else {
-			num = 13;
+		if (getGameType() == GType_ELVIRA) {
+			if (b >= 1000) {
+				b -= 1000;
+			} else {
+				num = 13;
+			}
 		}
 	}
 


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