thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add extra color table entry for v1 games, for inventory/sentence color.

Browse source 
svn-id: r11653
This commit is contained in:
Travis Howell 2003-12-15 14:54:35 +00:00
parent aa2173868b
commit bee21ec3f8
6 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/charset.cpp
View file

@ -931,7 +931,7 @@ void CharsetRendererV3::setColor(byte color)
_color = color; _color = color;
_shadowColor = (_vm->_features & GF_FMTOWNS) ? 8 : 0; _shadowColor = (_vm->_features & GF_FMTOWNS) ? 8 : 0;
// FM Towns version of Loom uses old colour method as well // FM Towns version of Loom uses old colour method as well
if (_vm->_features & GF_16COLOR || _vm->_gameId == GID_LOOM) { if ((_vm->_version >= 2) && (_vm->_features & GF_16COLOR || _vm->_gameId == GID_LOOM)) {
_dropShadow = ((_color & 0xF0) != 0); _dropShadow = ((_color & 0xF0) != 0);
_color &= 0x0f; _color &= 0x0f;
} else if (_vm->_features & GF_OLD256) { } else if (_vm->_features & GF_OLD256) {

2
scumm/gfx.cpp
View file

@ -2631,6 +2631,7 @@ void ScummEngine::setupV1ManiacPalette() {
setPalColor(13, 84, 252, 84); setPalColor(13, 84, 252, 84);
setPalColor(14, 84, 84, 252); setPalColor(14, 84, 84, 252);
setPalColor(15, 84, 84, 84); setPalColor(15, 84, 84, 84);
setPalColor(16, 252, 84, 252);
} }
void ScummEngine::setupV1ZakPalette() { void ScummEngine::setupV1ZakPalette() {
@ -2650,6 +2651,7 @@ void ScummEngine::setupV1ZakPalette() {
setPalColor(13, 84, 252, 84); setPalColor(13, 84, 252, 84);
setPalColor(14, 84, 84, 252); setPalColor(14, 84, 84, 252);
setPalColor(15, 168, 168, 168); setPalColor(15, 168, 168, 168);
setPalColor(16, 252, 84, 252);
} }
void ScummEngine::setPaletteFromPtr(const byte *ptr) { void ScummEngine::setPaletteFromPtr(const byte *ptr) {

7
scumm/saveload.cpp
View file

@ -178,12 +178,9 @@ bool ScummEngine::loadState(int slot, bool compat, SaveFileManager *mgr) {
// ever add options for using different 16-colour palettes. // ever add options for using different 16-colour palettes.
if (_version == 1) { if (_version == 1) {
if (_gameId == GID_MANIAC) { if (_gameId == GID_MANIAC)
setupV1ManiacPalette(); setupV1ManiacPalette();
if (_demoMode) else
setPalColor(15, 252, 84, 252);
} else
setupV1ZakPalette(); setupV1ZakPalette();
} else if (_features & GF_16COLOR) { } else if (_features & GF_16COLOR) {
if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST)) if ((_features & GF_AMIGA) || (_features & GF_ATARI_ST))

4
scumm/script_v2.cpp
View file

@ -825,7 +825,7 @@ void ScummEngine_v2::o2_verbOps() {
vs->verbid = verb; vs->verbid = verb;
if (_version == 1) { if (_version == 1) {
if (_gameId == GID_MANIAC && _demoMode) if (_gameId == GID_MANIAC && _demoMode)
vs->color = 15; vs->color = 16;
else else
vs->color = 5; vs->color = 5;
@ -1026,7 +1026,7 @@ void ScummEngine_v2::o2_drawSentence() {
_string[2].ypos = virtscr[2].topline; _string[2].ypos = virtscr[2].topline;
_string[2].xpos = 0; _string[2].xpos = 0;
if (_version == 1) if (_version == 1)
_string[2].color = 4; _string[2].color = 16;
else else
_string[2].color = 13; _string[2].color = 13;

6
scumm/scummvm.cpp
View file

@ -1019,11 +1019,9 @@ void ScummEngine::scummInit() {
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
_roomPalette[i] = i; _roomPalette[i] = i;
if (_version == 1) { if (_version == 1) {
if (_gameId == GID_MANIAC) { if (_gameId == GID_MANIAC)
setupV1ManiacPalette(); setupV1ManiacPalette();
if (_demoMode) else
setPalColor(15, 252, 84, 252);
} else
setupV1ZakPalette(); setupV1ZakPalette();
} else if (_features & GF_16COLOR) { } else if (_features & GF_16COLOR) {
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)

2
scumm/verbs.cpp
View file

@ -40,7 +40,7 @@ void ScummEngine::initV2MouseOver() {
int arrow_color, color, hi_color; int arrow_color, color, hi_color;
if (_version == 1) { if (_version == 1) {
color = 4; color = 16;
hi_color = 7; hi_color = 7;
arrow_color = 6; arrow_color = 6;
} else { } else {