diff options
| author | Travis Howell | 2003-08-19 04:47:38 +0000 |
|---|---|---|
| committer | Travis Howell | 2003-08-19 04:47:38 +0000 |
| commit | a34f8895cb160242eecb855500855f407920ca52 (patch) | |
| tree | 7aab4f37b5b7dc541f0734e8e434330480eb9cf9 | |
| parent | f25b54159c5752c9c99ace8018aab98693cea765 (diff) | |
| download | scummvm-rg350-a34f8895cb160242eecb855500855f407920ca52.tar.gz scummvm-rg350-a34f8895cb160242eecb855500855f407920ca52.tar.bz2 scummvm-rg350-a34f8895cb160242eecb855500855f407920ca52.zip | |
Revert color change for v1 maniac, which actually used in pool room.
svn-id: r9778
| -rw-r--r-- | scumm/gfx.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v2.cpp | 17 | ||||
| -rw-r--r-- | scumm/verbs.cpp | 6 |
3 files changed, 8 insertions, 17 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 8d46f6afa3..d56c22904b 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -2587,7 +2587,7 @@ void Scumm::setupV1ManiacPalette() { setPalColor(12, 168, 168, 168); setPalColor(13, 84, 252, 84); setPalColor(14, 84, 84, 252); - setPalColor(15, 252, 84, 252); + setPalColor(15, 84, 84, 84); } void Scumm::setupV1ZakPalette() { diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp index 486444b291..71a1824fc5 100644 --- a/scumm/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -846,9 +846,9 @@ void Scumm_v2::o2_verbOps() { vs->verbid = verb; if (_version == 1) { if (_gameId == GID_MANIAC && _demo_mode) - vs->color = 15; - else - vs->color = 5; + vs->color = 4; + else + vs->color = 5; vs->hicolor = 7; vs->dimcolor = 11; @@ -1010,14 +1010,10 @@ void Scumm_v2::o2_drawSentence() { _string[2].charset = 1; _string[2].ypos = virtscr[2].topline; _string[2].xpos = 0; - if(_version == 1) { - if (_gameId == GID_MANIAC) - _string[2].color = 15; - else - _string[2].color = 4; - } else { + if (_version == 1) + _string[2].color = 4; + else _string[2].color = 13; - } char *ptr = sentence; int n = 0; @@ -1337,7 +1333,6 @@ void Scumm_v2::o2_roomOps() { VAR(VAR_CAMERA_MAX_X) = b; break; case 2: /* room color */ - warning("Remapping color %d to color %d", b, a); _shadowPalette[b] = a; _fullRedraw = true; break; diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp index 92d00bf4cc..4f00d159f5 100644 --- a/scumm/verbs.cpp +++ b/scumm/verbs.cpp @@ -38,11 +38,7 @@ void Scumm::initV2MouseOver() { int arrow_color, color, hi_color; if (_version == 1) { - if (_gameId == GID_MANIAC) - color = 15; - else - color = 4; - + color = 4; hi_color = 7; arrow_color = 6; } else { |