[Scummvm-cvs-logs] SF.net SVN: scummvm: [30193] scummvm/trunk/engines/agi

[buddha_ at users.sourceforge.net]

Revision: 30193
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30193&view=rev
Author:   buddha_
Date:     2008-01-03 01:43:50 -0800 (Thu, 03 Jan 2008)

Log Message:
-----------
Made AGIPAL-loading more lenient with errors. Added AGIPAL-flag to Naturette 3. These together fix Naturette 3's intro (No more long shakings).

Modified Paths:
--------------
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/agi/graphics.cpp

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2008-01-03 08:58:25 UTC (rev 30192)
+++ scummvm/trunk/engines/agi/detection.cpp	2008-01-03 09:43:50 UTC (rev 30193)
@@ -1950,7 +1950,7 @@
 	FANMADE("Naturette 1 (English v1.3)", "f15bbf999ac55ebd404aa1eb84f7c1d9"),
 	FANMADE_L("Naturette 1 (French v1.2)", "d3665622cc41aeb9c7ecf4fa43f20e53", Common::FR_FRA),
 	FANMADE_F("Naturette 2: Daughter of the Moon (v1.0)", "bdf76a45621c7f56d1c9d40292c6137a", GF_AGIMOUSE|GF_AGIPAL),
-	FANMADE_F("Naturette 3: Adventure in Treeworld (v1.0a)", "6dbb0e7fc75fec442e6d9e5a06f1530e", GF_AGIMOUSE),
+	FANMADE_F("Naturette 3: Adventure in Treeworld (v1.0a)", "6dbb0e7fc75fec442e6d9e5a06f1530e", GF_AGIMOUSE|GF_AGIPAL),
 	FANMADE_F("Naturette 4: From a Planet to Another Planet (Not Finished)", "13be8cd9cf35aeff0a39b8757057fbc8", GF_AGIMOUSE),
 	FANMADE("New AGI Hangman Test", "d69c0e9050ccc29fd662b74d9fc73a15"),
 	FANMADE("Nick's Quest - In Pursuit of QuakeMovie (v2.1 Gold)", "e29cbf9222551aee40397fabc83eeca0"),

Modified: scummvm/trunk/engines/agi/graphics.cpp
===================================================================
--- scummvm/trunk/engines/agi/graphics.cpp	2008-01-03 08:58:25 UTC (rev 30192)
+++ scummvm/trunk/engines/agi/graphics.cpp	2008-01-03 09:43:50 UTC (rev 30193)
@@ -841,8 +841,10 @@
 	sprintf(filename, "pal.%d", p0);
 
 	Common::File agipal;
-	if (!agipal.open(filename))
-		error("Couldn't open AGIPAL palette file '%s'", filename);
+	if (!agipal.open(filename)) {
+		warning("Couldn't open AGIPAL palette file '%s'. Not changing palette", filename);
+		return; // Needed at least by Naturette 3 which uses AGIPAL but provides no palette files
+	}
 
 	//Chunk0 holds colors 0-7
 	agipal.read(&_agipalPalette[0], 24);
@@ -857,8 +859,10 @@
 
 	//Chunks4-7 are duplicates of chunks0-3
 
-	if (agipal.ioFailed())
-		error("Couldn't read AGIPAL palette from '%s'", filename);
+	if (agipal.ioFailed()) {
+		warning("Couldn't read AGIPAL palette from '%s'. Not changing palette", filename);
+		return;
+	}
 
 	_agipalFileNum = p0;
 


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