diff options
author | Filippos Karapetis | 2009-05-28 15:15:14 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-05-28 15:15:14 +0000 |
commit | c50edc8c4676e9a252a73301045f3cfd2ccb3915 (patch) | |
tree | 9d4780a7fcfbcff1af8bb6c48b55ca4ce3213c69 /engines/sci/gfx/gfx_resmgr.cpp | |
parent | 2ae183a48326eb8543ff9b7926364b86800c4467 (diff) | |
download | scummvm-rg350-c50edc8c4676e9a252a73301045f3cfd2ccb3915.tar.gz scummvm-rg350-c50edc8c4676e9a252a73301045f3cfd2ccb3915.tar.bz2 scummvm-rg350-c50edc8c4676e9a252a73301045f3cfd2ccb3915.zip |
Merged some of the SCI1 and SCI1.1 view and loop drawing functions
svn-id: r40961
Diffstat (limited to 'engines/sci/gfx/gfx_resmgr.cpp')
-rw-r--r-- | engines/sci/gfx/gfx_resmgr.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp index 1a0920bcfb..9eeada7b39 100644 --- a/engines/sci/gfx/gfx_resmgr.cpp +++ b/engines/sci/gfx/gfx_resmgr.cpp @@ -499,8 +499,6 @@ gfxr_pic_t *GfxResManager::addToPic(int old_nr, int new_nr, int flags, int old_d return pic; } -gfxr_view_t *gfxr_draw_view11(int id, byte *resource, int size); - gfxr_view_t *GfxResManager::getView(int nr, int *loop, int *cel, int palette) { IntResMap &resMap = _resourceMaps[GFX_RESOURCE_TYPE_VIEW]; gfx_resource_t *res = NULL; @@ -523,9 +521,9 @@ gfxr_view_t *GfxResManager::getView(int nr, int *loop, int *cel, int palette) { 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) - view = gfxr_draw_view1(resid, viewRes->data, viewRes->size, _staticPalette); + view = gfxr_draw_view1(resid, viewRes->data, viewRes->size, _staticPalette, false); else if (_version >= SCI_VERSION_1_1) - view = gfxr_draw_view11(resid, viewRes->data, viewRes->size); + view = gfxr_draw_view1(resid, viewRes->data, viewRes->size, 0, true); if (_isVGA) { if (!view->palette) { |