libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split the v1 palette, since there is a minor difference.

Browse Source 
svn-id: r8999
This commit is contained in:
Travis Howell 2003-07-14 06:44:47 +00:00
parent 89cc9ede19
commit 73365aa2c7
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scumm/gfx.cpp
View File

@ -2573,7 +2573,7 @@ void Scumm::setupEGAPalette() {
setPalColor(15, 252, 252, 252);
}
void Scumm::setupC64Palette() {
void Scumm::setupV1ManiacPalette() {
setPalColor( 0, 0, 0, 0);
setPalColor( 1, 252, 252, 252);
setPalColor( 2, 168, 0, 0);
@ -2592,6 +2592,25 @@ void Scumm::setupC64Palette() {
setPalColor(15, 84, 84, 84);
}
void Scumm::setupV1ZakPalette() {
setPalColor( 0, 0, 0, 0);
setPalColor( 1, 252, 252, 252);
setPalColor( 2, 168, 0, 0);
setPalColor( 3, 0, 168, 168);
setPalColor( 4, 168, 0, 168);
setPalColor( 5, 0, 168, 0);
setPalColor( 6, 0, 0, 168);
setPalColor( 7, 252, 252, 84);
setPalColor( 8, 252, 84, 84);
setPalColor( 9, 168, 84, 0);
setPalColor(10, 252, 84, 84);
setPalColor(11, 84, 84, 84);
setPalColor(12, 168, 168, 168);
setPalColor(13, 84, 252, 84);
setPalColor(14, 84, 84, 252);
setPalColor(15, 168, 168, 168);
}
/* Old palette used in Commodre 64 versions
void Scumm::setupC64Palette() {

5
scumm/saveload.cpp
View File

@ -170,7 +170,10 @@ bool Scumm::loadState(int slot, bool compat, SaveFileManager *mgr) {
// ever add options for using different 16-colour palettes.
if (_version == 1) {
setupC64Palette();
if (_gameId == GID_MANIAC)
setupV1ManiacPalette();
else
setupV1ZakPalette();
} else if (_features & GF_16COLOR) {
if (_features & GF_AMIGA)
setupAmigaPalette();

3
scumm/scumm.h
View File

@ -874,7 +874,8 @@ protected:
const byte *getPalettePtr();
void setupAmigaPalette();
void setupEGAPalette();
void setupC64Palette();
void setupV1ManiacPalette();
void setupV1ZakPalette();
void setPalette(int pal);
void setPaletteFromPtr(const byte *ptr);
void setPaletteFromRes();

5
scumm/scummvm.cpp
View File

@ -791,7 +791,10 @@ void Scumm::scummInit() {
if (_version == 1) {
for (i = 0; i < 16; i++)
_shadowPalette[i] = i;
setupC64Palette();
if (_gameId == GID_MANIAC)
setupV1ManiacPalette();
else
setupV1ZakPalette();
} else if (_features & GF_16COLOR) {
for (i = 0; i < 16; i++)
_shadowPalette[i] = i;