aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gfx
diff options
context:
space:
mode:
authorFilippos Karapetis2009-07-07 20:17:07 +0000
committerFilippos Karapetis2009-07-07 20:17:07 +0000
commitee15f8f51ad5ec1a6fd776c4a12fb4167dfec8ed (patch)
tree03d6c2d506f5a2c4bfb1e8a55ac31a7963f1ea61 /engines/sci/gfx
parent802abfd8cbaf3143f2c66053a4839ee3914596ce (diff)
downloadscummvm-rg350-ee15f8f51ad5ec1a6fd776c4a12fb4167dfec8ed.tar.gz
scummvm-rg350-ee15f8f51ad5ec1a6fd776c4a12fb4167dfec8ed.tar.bz2
scummvm-rg350-ee15f8f51ad5ec1a6fd776c4a12fb4167dfec8ed.zip
Improved the LSL1VGA workaround after talking with waltervn
svn-id: r42239
Diffstat (limited to 'engines/sci/gfx')
-rw-r--r--engines/sci/gfx/gfx_resmgr.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp
index 4a97d94f31..d6d5a9ec3c 100644
--- a/engines/sci/gfx/gfx_resmgr.cpp
+++ b/engines/sci/gfx/gfx_resmgr.cpp
@@ -617,10 +617,9 @@ gfx_bitmap_font_t *GfxResManager::getFont(int num, bool scaled) {
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;