diff options
| author | Filippos Karapetis | 2009-07-04 16:30:20 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-07-04 16:30:20 +0000 |
| commit | b093511239401c5d64d6b21c0b875d5be6e5f239 (patch) | |
| tree | 935c78d3b317f14074f39acc9e21e87bca1762cb /engines/sci/gfx/gfx_resmgr.cpp | |
| parent | c5522b37660644666c2842045cf64f1254cc3e17 (diff) | |
| download | scummvm-rg350-b093511239401c5d64d6b21c0b875d5be6e5f239.tar.gz scummvm-rg350-b093511239401c5d64d6b21c0b875d5be6e5f239.tar.bz2 scummvm-rg350-b093511239401c5d64d6b21c0b875d5be6e5f239.zip | |
- Merged the "early" and "late" SCI1 versions - these are functionally equivalent, and the code that does the version check is unreliable (e.g. it sets SQ1 VGA to SCI1 "late" and EcoQuest 1 to SCI1 "early")
- Cleanup of the vocabulary setting functions
- Cleanup of the cursor manipulation code
svn-id: r42097
Diffstat (limited to 'engines/sci/gfx/gfx_resmgr.cpp')
| -rw-r--r-- | engines/sci/gfx/gfx_resmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp index 0ec27ae41a..1289997721 100644 --- a/engines/sci/gfx/gfx_resmgr.cpp +++ b/engines/sci/gfx/gfx_resmgr.cpp @@ -534,7 +534,7 @@ gfxr_view_t *GfxResManager::getView(int nr, int *loop, int *cel, int palette) { view = gfxr_draw_view0(resid, viewRes->data, viewRes->size, -1); else if (_version == SCI_VERSION_01 || !_isVGA) view = gfxr_draw_view0(resid, viewRes->data, viewRes->size, palette); - else if (_version >= SCI_VERSION_01_VGA && _version <= SCI_VERSION_1_LATE) + else if (_version >= SCI_VERSION_01_VGA && _version <= SCI_VERSION_1) view = gfxr_draw_view1(resid, viewRes->data, viewRes->size, _staticPalette, false); else if (_version >= SCI_VERSION_1_1) view = gfxr_draw_view1(resid, viewRes->data, viewRes->size, 0, true); |