[Scummvm-cvs-logs] SF.net SVN: scummvm:[42239] scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp

[thebluegr at users.sourceforge.net]

Revision: 42239
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42239&view=rev
Author:   thebluegr
Date:     2009-07-07 20:17:07 +0000 (Tue, 07 Jul 2009)

Log Message:
-----------
Improved the LSL1VGA workaround after talking with waltervn

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp

Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-07-07 20:01:15 UTC (rev 42238)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-07-07 20:17:07 UTC (rev 42239)
@@ -617,10 +617,9 @@
 	int hash = getOptionsHash(GFX_RESOURCE_TYPE_FONT);
 
 	// Workaround: LSL1VGA mixes its own internal fonts with the global
-	// SCI ones, so we translate them here
-	if (!resMap.contains(num) && num >= 2048)
-		if (!_resManager->testResource(ResourceId(kResourceTypeFont, num)))
-			num = num - 2048;
+	// SCI ones, so we translate them here, by removing their extra bits
+	if (!resMap.contains(num) && !_resManager->testResource(ResourceId(kResourceTypeFont, num)))
+			num = num & 0x7ff;
 
 	res = resMap.contains(num) ? resMap[num] : NULL;
 


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