diff options
| author | Travis Howell | 2009-07-10 23:40:21 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-07-10 23:40:21 +0000 |
| commit | 0577bee93893a55be1b2a067ec18f3c8ad462358 (patch) | |
| tree | fafa1dcfe20233fcd2be7bfd4483fb27f91503ca /engines/sci | |
| parent | 70c138651dc71f886a4314943c4e9a753dc44607 (diff) | |
| parent | 272e9487aaab6119fd643c3443fddbdfedb2f73e (diff) | |
| download | scummvm-rg350-0577bee93893a55be1b2a067ec18f3c8ad462358.tar.gz scummvm-rg350-0577bee93893a55be1b2a067ec18f3c8ad462358.tar.bz2 scummvm-rg350-0577bee93893a55be1b2a067ec18f3c8ad462358.zip | |
Merged revisions 42322,42328,42345-42346,42354-42358 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
........
r42322 | dreammaster | 2009-07-10 10:49:13 +1000 (Fri, 10 Jul 2009) | 1 line
Changed the status of the Tinsel engine to be enabled by default
........
r42328 | sev | 2009-07-10 18:40:44 +1000 (Fri, 10 Jul 2009) | 2 lines
Mention cruise support
........
r42345 | thebluegr | 2009-07-11 04:53:40 +1000 (Sat, 11 Jul 2009) | 1 line
Applied patch #2819665 - "SCI: cell palette fix for QfG3/SQ5/etc."
........
r42346 | sev | 2009-07-11 05:06:24 +1000 (Sat, 11 Jul 2009) | 2 lines
This is 1.0.0svn
........
r42354 | drmccoy | 2009-07-11 07:49:47 +1000 (Sat, 11 Jul 2009) | 1 line
Fixing mismatched delete
........
r42355 | drmccoy | 2009-07-11 08:11:36 +1000 (Sat, 11 Jul 2009) | 1 line
Mention the Gob savegame format change and change the version from 0.14.0 to 1.0.0 there too
........
r42356 | Hkz | 2009-07-11 08:13:27 +1000 (Sat, 11 Jul 2009) | 1 line
tinsel: proper detection entry for Discworld 1 Italian only CD
........
r42357 | wjpalenstijn | 2009-07-11 08:29:25 +1000 (Sat, 11 Jul 2009) | 4 lines
Recreate FSNode after calling checkPath since checkPath may
have created the directory the FSNode points to, invalidating
its cached metadata. In the future, it might be nice to add
a FSNode::rescan() function for this? This fixes #2793187 .
........
r42358 | sev | 2009-07-11 08:46:36 +1000 (Sat, 11 Jul 2009) | 5 lines
Restored several files after the version update.
.in files are THE sources, and have to be modified, not the files generated
from them.
........
svn-id: r42359
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/gfx/gfx_resmgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp index 9343b66cb8..ac48b74559 100644 --- a/engines/sci/gfx/gfx_resmgr.cpp +++ b/engines/sci/gfx/gfx_resmgr.cpp @@ -601,6 +601,8 @@ gfxr_view_t *GfxResManager::getView(int nr, int *loop, int *cel, int palette) { } if (!cel_data->data) { + if (!cel_data->palette) + cel_data->palette = view->palette->getref(); #ifdef CUSTOM_GRAPHICS_OPTIONS gfx_get_res_config(_options, cel_data); gfx_xlate_pixmap(cel_data, _driver->getMode(), _options->view_xlate_filter); |