diff options
author | Eugene Sandulenko | 2013-07-19 17:59:03 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2013-09-06 14:51:02 +0300 |
commit | cf35f34454ad1f9224481e8cfe027d8fae4b8e76 (patch) | |
tree | 1804e45ab50e79f465495d3c674818474c80c1dd /engines/fullpipe/scene.cpp | |
parent | 0c218f01444b8917924ce38d5fafc20890d817fa (diff) | |
download | scummvm-rg350-cf35f34454ad1f9224481e8cfe027d8fae4b8e76.tar.gz scummvm-rg350-cf35f34454ad1f9224481e8cfe027d8fae4b8e76.tar.bz2 scummvm-rg350-cf35f34454ad1f9224481e8cfe027d8fae4b8e76.zip |
FULLPIPE: Beginning of scene drawing
Diffstat (limited to 'engines/fullpipe/scene.cpp')
-rw-r--r-- | engines/fullpipe/scene.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/engines/fullpipe/scene.cpp b/engines/fullpipe/scene.cpp index 37b35607f0..81fa91cca0 100644 --- a/engines/fullpipe/scene.cpp +++ b/engines/fullpipe/scene.cpp @@ -180,16 +180,16 @@ bool Scene::load(MfcArchive &file) { _libHandle = g_fullpipe->_currArchive; - if (_picObjList.size() > 0 && _stringObj && strlen(_stringObj) > 1) { + if (_picObjList.size() > 0 && _bgname && strlen(_bgname) > 1) { char fname[260]; - strcpy(fname, _stringObj); + strcpy(fname, _bgname); strcpy(strrchr(fname, '.') + 1, "col"); MemoryObject *col = new MemoryObject(); col->loadFile(fname); - _colorMemoryObj = col; + _palette = col; } char *shdname = genFileName(0, _sceneId, "shd"); @@ -260,6 +260,12 @@ void Scene::updateScrolling(int par) { } void Scene::drawContent(int minPri, int maxPri, bool drawBG) { + if (!_picObjList.size() && !_bigPictureArray1Count) + return; + + if (_palette) { + warning("Scene palette is ignored"); + } } } // End of namespace Fullpipe |