[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.189,2.190 script_v2.cpp,2.176,2.177 scumm.h,1.287,1.288 scummvm.cpp,2.348,2.349 verbs.cpp,1.70,1.71
Travis Howell
kirben at users.sourceforge.net
Mon Aug 18 21:16:03 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15721/scumm
Modified Files:
gfx.cpp script_v2.cpp scumm.h scummvm.cpp verbs.cpp
Log Message:
Cleanup v1/v2 color settings for sentance/inventory/verb area.
Add highlight color for v1 maniac
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.189
retrieving revision 2.190
diff -u -d -r2.189 -r2.190
--- gfx.cpp 18 Aug 2003 20:32:51 -0000 2.189
+++ gfx.cpp 19 Aug 2003 04:15:14 -0000 2.190
@@ -2581,7 +2581,7 @@
setPalColor(12, 168, 168, 168);
setPalColor(13, 84, 252, 84);
setPalColor(14, 84, 84, 252);
- setPalColor(15, 84, 84, 84);
+ setPalColor(15, 252, 84, 252);
}
void Scumm::setupV1ZakPalette() {
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.176
retrieving revision 2.177
diff -u -d -r2.176 -r2.177
--- script_v2.cpp 18 Aug 2003 11:09:11 -0000 2.176
+++ script_v2.cpp 19 Aug 2003 04:15:14 -0000 2.177
@@ -840,10 +840,11 @@
vs = &_verbs[slot];
vs->verbid = verb;
if (_version == 1) {
- if (_demo_mode)
- vs->color = 4;
- else
- vs->color = 5;
+ if (_gameId == GID_MANIAC && _demo_mode)
+ vs->color = 15;
+ else
+ vs->color = 5;
+
vs->hicolor = 7;
vs->dimcolor = 11;
} else {
@@ -1004,10 +1005,14 @@
_string[2].charset = 1;
_string[2].ypos = virtscr[2].topline;
_string[2].xpos = 0;
- if(_version == 1)
- _string[2].color = 4;
- else
+ if(_version == 1) {
+ if (_gameId == GID_MANIAC)
+ _string[2].color = 15;
+ else
+ _string[2].color = 4;
+ } else {
_string[2].color = 13;
+ }
char *ptr = sentence;
int n = 0;
@@ -1327,6 +1332,7 @@
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;
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- scumm.h 14 Aug 2003 11:40:50 -0000 1.287
+++ scumm.h 19 Aug 2003 04:15:14 -0000 1.288
@@ -764,7 +764,6 @@
V2MouseoverBox v2_mouseover_boxes[7];
int8 v2_mouseover_box;
- void initV1MouseOver();
void initV2MouseOver();
void checkV2MouseOver(ScummVM::Point pos);
void checkV2Inventory(int x, int y);
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.348
retrieving revision 2.349
diff -u -d -r2.348 -r2.349
--- scummvm.cpp 18 Aug 2003 04:53:54 -0000 2.348
+++ scummvm.cpp 19 Aug 2003 04:15:14 -0000 2.349
@@ -895,10 +895,7 @@
}
if (_version <= 2) {
- if (_version == 1)
- initV1MouseOver();
- else
- initV2MouseOver();
+ initV2MouseOver();
// Seems in V2 there was only a single room effect (iris),
// so we set that here.
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- verbs.cpp 27 Jul 2003 17:33:28 -0000 1.70
+++ verbs.cpp 19 Aug 2003 04:15:14 -0000 1.71
@@ -33,64 +33,24 @@
kSentenceLine = 6
};
-void Scumm::initV1MouseOver() {
+void Scumm::initV2MouseOver() {
int i;
+ int arrow_color, color, hi_color;
- v2_mouseover_box = -1;
-
- // Inventory items
-
- for (i = 0; i < 2; i++) {
- v2_mouseover_boxes[2 * i].rect.left = 0;
- v2_mouseover_boxes[2 * i].rect.right = 144;
- v2_mouseover_boxes[2 * i].rect.top = 32 + 8 * i;
- v2_mouseover_boxes[2 * i].rect.bottom = v2_mouseover_boxes[2 * i].rect.top + 8;
-
- v2_mouseover_boxes[2 * i].color = 4;
- v2_mouseover_boxes[2 * i].hicolor = 7;
-
-
- v2_mouseover_boxes[2 * i + 1].rect.left = 176;
- v2_mouseover_boxes[2 * i + 1].rect.right = 320;
- 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;
+ if (_version == 1) {
+ if (_gameId == GID_MANIAC)
+ color = 15;
+ else
+ color = 4;
- v2_mouseover_boxes[2 * i + 1].color = 4;
- v2_mouseover_boxes[2 * i + 1].hicolor = 7;
+ hi_color = 7;
+ arrow_color = 6;
+ } else {
+ color = 13;
+ hi_color = 14;
+ arrow_color = 1;
}
- // Inventory arrows
-
- v2_mouseover_boxes[kInventoryUpArrow].rect.left = 144;
- v2_mouseover_boxes[kInventoryUpArrow].rect.right = 176;
- v2_mouseover_boxes[kInventoryUpArrow].rect.top = 32;
- v2_mouseover_boxes[kInventoryUpArrow].rect.bottom = 40;
-
- v2_mouseover_boxes[kInventoryUpArrow].color = 6;
- v2_mouseover_boxes[kInventoryUpArrow].hicolor = 7;
-
- v2_mouseover_boxes[kInventoryDownArrow].rect.left = 144;
- v2_mouseover_boxes[kInventoryDownArrow].rect.right = 176;
- v2_mouseover_boxes[kInventoryDownArrow].rect.top = 40;
- v2_mouseover_boxes[kInventoryDownArrow].rect.bottom = 48;
-
- v2_mouseover_boxes[kInventoryDownArrow].color = 6;
- v2_mouseover_boxes[kInventoryDownArrow].hicolor = 7;
-
- // Sentence line
-
- v2_mouseover_boxes[kSentenceLine].rect.left = 0;
- v2_mouseover_boxes[kSentenceLine].rect.right = 320;
- v2_mouseover_boxes[kSentenceLine].rect.top = 0;
- v2_mouseover_boxes[kSentenceLine].rect.bottom = 8;
-
- v2_mouseover_boxes[kSentenceLine].color = 4;
- v2_mouseover_boxes[kSentenceLine].hicolor = 7;
-}
-
-void Scumm::initV2MouseOver() {
- int i;
-
v2_mouseover_box = -1;
// Inventory items
@@ -101,8 +61,8 @@
v2_mouseover_boxes[2 * i].rect.top = 32 + 8 * i;
v2_mouseover_boxes[2 * i].rect.bottom = v2_mouseover_boxes[2 * i].rect.top + 8;
- v2_mouseover_boxes[2 * i].color = 13;
- v2_mouseover_boxes[2 * i].hicolor = 14;
+ v2_mouseover_boxes[2 * i].color = color;
+ v2_mouseover_boxes[2 * i].hicolor = hi_color;
v2_mouseover_boxes[2 * i + 1].rect.left = 176;
@@ -110,8 +70,8 @@
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 = 13;
- v2_mouseover_boxes[2 * i + 1].hicolor = 14;
+ v2_mouseover_boxes[2 * i + 1].color = color;
+ v2_mouseover_boxes[2 * i + 1].hicolor = hi_color;
}
// Inventory arrows
@@ -121,16 +81,16 @@
v2_mouseover_boxes[kInventoryUpArrow].rect.top = 32;
v2_mouseover_boxes[kInventoryUpArrow].rect.bottom = 40;
- v2_mouseover_boxes[kInventoryUpArrow].color = 1;
- v2_mouseover_boxes[kInventoryUpArrow].hicolor = 14;
+ v2_mouseover_boxes[kInventoryUpArrow].color = arrow_color;
+ v2_mouseover_boxes[kInventoryUpArrow].hicolor = hi_color;
v2_mouseover_boxes[kInventoryDownArrow].rect.left = 144;
v2_mouseover_boxes[kInventoryDownArrow].rect.right = 176;
v2_mouseover_boxes[kInventoryDownArrow].rect.top = 40;
v2_mouseover_boxes[kInventoryDownArrow].rect.bottom = 48;
- v2_mouseover_boxes[kInventoryDownArrow].color = 1;
- v2_mouseover_boxes[kInventoryDownArrow].hicolor = 14;
+ v2_mouseover_boxes[kInventoryDownArrow].color = arrow_color;
+ v2_mouseover_boxes[kInventoryDownArrow].hicolor = hi_color;
// Sentence line
@@ -139,8 +99,8 @@
v2_mouseover_boxes[kSentenceLine].rect.top = 0;
v2_mouseover_boxes[kSentenceLine].rect.bottom = 8;
- v2_mouseover_boxes[kSentenceLine].color = 13;
- v2_mouseover_boxes[kSentenceLine].hicolor = 14;
+ v2_mouseover_boxes[kSentenceLine].color = color;
+ v2_mouseover_boxes[kSentenceLine].hicolor = hi_color;
}
void Scumm::checkV2MouseOver(ScummVM::Point pos) {
More information about the Scummvm-git-logs
mailing list