[Scummvm-cvs-logs] SF.net SVN: scummvm:[54390] scummvm/trunk/engines/sci/graphics

[thebluegr at users.sourceforge.net]

Revision: 54390
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54390&view=rev
Author:   thebluegr
Date:     2010-11-20 00:20:05 +0000 (Sat, 20 Nov 2010)

Log Message:
-----------
SCI: Some minor fixes for Phantasmagoria 2 (which doesn't work at all, since it has some differences in its views)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/frameout.cpp
    scummvm/trunk/engines/sci/graphics/view.cpp

Modified: scummvm/trunk/engines/sci/graphics/frameout.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/frameout.cpp	2010-11-19 23:49:04 UTC (rev 54389)
+++ scummvm/trunk/engines/sci/graphics/frameout.cpp	2010-11-20 00:20:05 UTC (rev 54390)
@@ -63,8 +63,15 @@
 	if (_planes.empty()) {
 		// There has to be another way for sierra sci to do this or maybe script resolution is compiled into
 		//  interpreter (TODO)
-		scriptsRunningHeight = readSelectorValue(_segMan, object, SELECTOR(resY));
-		scriptsRunningWidth = readSelectorValue(_segMan, object, SELECTOR(resX));
+		uint16 tmpRunningWidth = readSelectorValue(_segMan, object, SELECTOR(resX));
+		uint16 tmpRunningHeight = readSelectorValue(_segMan, object, SELECTOR(resY));
+
+		// The above can be 0 in SCI3 (e.g. Phantasmagoria 2)
+		if (tmpRunningWidth > 0 && tmpRunningHeight > 0) {
+			scriptsRunningWidth = tmpRunningWidth;
+			scriptsRunningHeight = tmpRunningHeight;
+		}
+
 		_coordAdjuster->setScriptsResolution(scriptsRunningWidth, scriptsRunningHeight);
 	}
 

Modified: scummvm/trunk/engines/sci/graphics/view.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/view.cpp	2010-11-19 23:49:04 UTC (rev 54389)
+++ scummvm/trunk/engines/sci/graphics/view.cpp	2010-11-20 00:20:05 UTC (rev 54390)
@@ -217,7 +217,7 @@
 		case 0:
 			break; // don't do anything, we already have _isScaleable set
 		default:
-			error("unsupported flags byte inside sci1.1 view");
+			error("unsupported flags byte (%d) inside sci1.1 view", _resourceData[3]);
 			break;
 		}
 


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