aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2003-07-14 06:14:49 +0000
committerTravis Howell2003-07-14 06:14:49 +0000
commite6f3eb9aa53ace350d698ba444008b083deffd01 (patch)
treef78260880b7259ce80203abdddb533140734c0b7
parent9b55abbf49f3ea4d3cdbecb9898838283f59fcf1 (diff)
downloadscummvm-rg350-e6f3eb9aa53ace350d698ba444008b083deffd01.tar.gz
scummvm-rg350-e6f3eb9aa53ace350d698ba444008b083deffd01.tar.bz2
scummvm-rg350-e6f3eb9aa53ace350d698ba444008b083deffd01.zip
A few color fixes for v1/v2
svn-id: r8997
-rw-r--r--scumm/gfx.cpp2
-rw-r--r--scumm/script_v2.cpp5
-rw-r--r--scumm/verbs.cpp8
3 files changed, 9 insertions, 6 deletions
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index f9bf6d5836..03e3e480bc 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -2589,7 +2589,7 @@ void Scumm::setupC64Palette() {
setPalColor(12, 168, 168, 168);
setPalColor(13, 84, 252, 84);
setPalColor(14, 84, 84, 252);
- setPalColor(15, 168, 168, 168);
+ setPalColor(15, 84, 84, 84);
}
/* Old palette used in Commodre 64 versions
diff --git a/scumm/script_v2.cpp b/scumm/script_v2.cpp
index 3492163b52..ad948e9fc5 100644
--- a/scumm/script_v2.cpp
+++ b/scumm/script_v2.cpp
@@ -982,7 +982,10 @@ void Scumm_v2::o2_drawSentence() {
_string[2].charset = 1;
_string[2].ypos = virtscr[2].topline;
_string[2].xpos = 0;
- _string[2].color = 5;
+ if(_version == 1)
+ _string[2].color = 13;
+ else
+ _string[2].color = 4;
sentence[80] = 0;
_messagePtr = (byte*)sentence;
diff --git a/scumm/verbs.cpp b/scumm/verbs.cpp
index 520f109fe1..21c6dff7bd 100644
--- a/scumm/verbs.cpp
+++ b/scumm/verbs.cpp
@@ -84,7 +84,7 @@ void Scumm::initV1MouseOver() {
v2_mouseover_boxes[kSentenceLine].rect.top = 0;
v2_mouseover_boxes[kSentenceLine].rect.bottom = 8;
- v2_mouseover_boxes[kSentenceLine].color = 5;
+ v2_mouseover_boxes[kSentenceLine].color = 4;
v2_mouseover_boxes[kSentenceLine].hicolor = 7;
}
@@ -101,7 +101,7 @@ void Scumm::initV2MouseOver() {
v2_mouseover_boxes[2 * i].rect.top = 34 + 8 * i;
v2_mouseover_boxes[2 * i].rect.bottom = v2_mouseover_boxes[2 * i].rect.top + 8;
- v2_mouseover_boxes[2 * i].color = 5;
+ v2_mouseover_boxes[2 * i].color = 13;
v2_mouseover_boxes[2 * i].hicolor = 14;
@@ -110,7 +110,7 @@ void Scumm::initV2MouseOver() {
v2_mouseover_boxes[2 * i + 1].rect.top = v2_mouseover_boxes[2 * i].rect.top;
v2_mouseover_boxes[2 * i + 1].rect.bottom = v2_mouseover_boxes[2 * i].rect.bottom;
- v2_mouseover_boxes[2 * i + 1].color = 5;
+ v2_mouseover_boxes[2 * i + 1].color = 13;
v2_mouseover_boxes[2 * i + 1].hicolor = 14;
}
@@ -139,7 +139,7 @@ void Scumm::initV2MouseOver() {
v2_mouseover_boxes[kSentenceLine].rect.top = 0;
v2_mouseover_boxes[kSentenceLine].rect.bottom = 8;
- v2_mouseover_boxes[kSentenceLine].color = 5;
+ v2_mouseover_boxes[kSentenceLine].color = 13;
v2_mouseover_boxes[kSentenceLine].hicolor = 14;
}