diff options
| author | David Corrales | 2007-05-31 23:44:43 +0000 |
|---|---|---|
| committer | David Corrales | 2007-05-31 23:44:43 +0000 |
| commit | 0cab5b7791e56b32455748bf20c21f0d6b42f654 (patch) | |
| tree | 9e6580328542f1db230e019ba77e3db1be8fa50b /engines/saga/gfx.cpp | |
| parent | 6c69d531d262e14fa02b6e1adb42baaa5c74dbe6 (diff) | |
| parent | 22c0403e0dfec16badf156afa842c6c37e850263 (diff) | |
| download | scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.gz scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.tar.bz2 scummvm-rg350-0cab5b7791e56b32455748bf20c21f0d6b42f654.zip | |
Merged the fs branch with trunk. r26949:27031
svn-id: r27032
Diffstat (limited to 'engines/saga/gfx.cpp')
| -rw-r--r-- | engines/saga/gfx.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/engines/saga/gfx.cpp b/engines/saga/gfx.cpp index bb85bd9b5f..a9c6801714 100644 --- a/engines/saga/gfx.cpp +++ b/engines/saga/gfx.cpp @@ -1,7 +1,8 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2006 The ScummVM project +/* ScummVM - Graphic Adventure Engine * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -215,6 +216,10 @@ void Gfx::setPalette(const PalEntry *pal, bool full) { ppal[3] = 0; } + // Color 0 should always be black in IHNM + if (_vm->getGameType() == GType_IHNM) + memset(&_currentPal[0 * 4], 0, 4); + // Make 256th color black. See bug #1256368 if ((_vm->getPlatform() == Common::kPlatformMacintosh) && !_vm->_scene->isInIntro()) memset(&_currentPal[255 * 4], 0, 4); @@ -320,6 +325,10 @@ void Gfx::palToBlack(PalEntry *srcPal, double percent) { ppal[3] = 0; } + // Color 0 should always be black in IHNM + if (_vm->getGameType() == GType_IHNM) + memset(&_currentPal[0 * 4], 0, 4); + // Make 256th color black. See bug #1256368 if ((_vm->getPlatform() == Common::kPlatformMacintosh) && !_vm->_scene->isInIntro()) memset(&_currentPal[255 * 4], 0, 4); @@ -385,6 +394,10 @@ void Gfx::blackToPal(PalEntry *srcPal, double percent) { ppal[3] = 0; } + // Color 0 should always be black in IHNM + if (_vm->getGameType() == GType_IHNM) + memset(&_currentPal[0 * 4], 0, 4); + // Make 256th color black. See bug #1256368 if ((_vm->getPlatform() == Common::kPlatformMacintosh) && !_vm->_scene->isInIntro()) memset(&_currentPal[255 * 4], 0, 4); |