aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/view.cpp
diff options
context:
space:
mode:
authorMartin Kiewitz2010-06-22 19:01:43 +0000
committerMartin Kiewitz2010-06-22 19:01:43 +0000
commit38cf6aa3e4c0415f507f5ec514834440bfbf90ca (patch)
tree03fd5f28e2e3c8dc0fece6484debdf47c8957e29 /engines/sci/graphics/view.cpp
parent56bf0c0e635383929704ba12df3808f39aeb697e (diff)
downloadscummvm-rg350-38cf6aa3e4c0415f507f5ec514834440bfbf90ca.tar.gz
scummvm-rg350-38cf6aa3e4c0415f507f5ec514834440bfbf90ca.tar.bz2
scummvm-rg350-38cf6aa3e4c0415f507f5ec514834440bfbf90ca.zip
SCI: implemented kAssertPalette and a palvary fix for ::set, fixes erana's place in qfg1vga nighttime
svn-id: r50162
Diffstat (limited to 'engines/sci/graphics/view.cpp')
-rw-r--r--engines/sci/graphics/view.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index 7c33f87a14..40e2a4fb30 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -653,7 +653,7 @@ uint16 GfxView::getCelCount(int16 loopNo) {
}
Palette *GfxView::getPalette() {
- return _embeddedPal ? &_viewPalette : &_palette->_sysPalette;
+ return _embeddedPal ? &_viewPalette : NULL;
}
} // End of namespace Sci