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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue Jul 7 22:01:16 CEST 2009


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

Log Message:
-----------
Added a workaround for incorrect font references in LSL1VGA (which was the original purpose of the code removed in rev. 42219)

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 19:53:40 UTC (rev 42237)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-07-07 20:01:15 UTC (rev 42238)
@@ -616,6 +616,12 @@
 	gfx_resource_t *res = NULL;
 	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;
+
 	res = resMap.contains(num) ? resMap[num] : NULL;
 
 	if (!res || res->mode != hash) {


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