[Scummvm-cvs-logs] CVS: scummvm/scumm script_v1.cpp,1.32,1.33 script_v2.cpp,1.53,1.54 scumm.h,1.65,1.66 string.cpp,1.50,1.51 verbs.cpp,1.7,1.8 verbs.h,1.1,1.2
Max Horn
fingolfin at users.sourceforge.net
Fri Nov 29 10:28:04 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv12238
Modified Files:
script_v1.cpp script_v2.cpp scumm.h string.cpp verbs.cpp
verbs.h
Log Message:
more cleanup
Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v1.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- script_v1.cpp 29 Nov 2002 15:13:30 -0000 1.32
+++ script_v1.cpp 29 Nov 2002 18:27:35 -0000 1.33
@@ -2155,14 +2155,14 @@
a = getVarOrDirectWord(0x80);
if (slot) {
setVerbObject(_roomResource, a, slot);
- vs->type = 1;
+ vs->type = kImageVerbType;
}
break;
case 2: /* load from code */
loadPtrToResource(rtVerb, slot, NULL);
if (slot == 0)
nukeResource(rtVerb, slot);
- vs->type = 0;
+ vs->type = kTextVerbType;
vs->imgindex = 0;
break;
case 3: /* color */
@@ -2224,7 +2224,7 @@
vs->color = 2;
vs->hicolor = 0;
vs->dimcolor = 8;
- vs->type = 0;
+ vs->type = kTextVerbType;
vs->charset_nr = _string[0].t_charset;
vs->curmode = 0;
vs->saveid = 0;
@@ -2254,7 +2254,7 @@
}
if (slot == 0)
nukeResource(rtVerb, slot);
- vs->type = 0;
+ vs->type = kTextVerbType;
vs->imgindex = 0;
break;
case 22: /* assign object */
@@ -2262,7 +2262,7 @@
b = getVarOrDirectByte(0x40);
if (slot && vs->imgindex != a) {
setVerbObject(b, a, slot);
- vs->type = 1;
+ vs->type = kImageVerbType;
vs->imgindex = a;
}
break;
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- script_v2.cpp 29 Nov 2002 15:13:32 -0000 1.53
+++ script_v2.cpp 29 Nov 2002 18:27:35 -0000 1.54
@@ -1784,12 +1784,12 @@
a = pop();
if (_curVerbSlot) {
setVerbObject(_roomResource, a, slot);
- vs->type = 1;
+ vs->type = kImageVerbType;
}
break;
case 125:
loadPtrToResource(rtVerb, slot, NULL);
- vs->type = 0;
+ vs->type = kTextVerbType;
vs->imgindex = 0;
break;
case 126:
@@ -1827,7 +1827,7 @@
vs->color = 2;
vs->hicolor = 0;
vs->dimcolor = 8;
- vs->type = 0;
+ vs->type = kTextVerbType;
vs->charset_nr = _string[0].t_charset;
vs->curmode = 0;
vs->saveid = 0;
@@ -1855,7 +1855,7 @@
ptr = getStringAddress(a);
}
loadPtrToResource(rtVerb, slot, ptr);
- vs->type = 0;
+ vs->type = kTextVerbType;
vs->imgindex = 0;
break;
case 139:
@@ -1863,7 +1863,7 @@
a = pop();
if (slot && a != vs->imgindex) {
setVerbObject(b, a, slot);
- vs->type = 1;
+ vs->type = kImageVerbType;
vs->imgindex = a;
}
break;
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- scumm.h 29 Nov 2002 15:13:34 -0000 1.65
+++ scumm.h 29 Nov 2002 18:27:35 -0000 1.66
@@ -174,7 +174,7 @@
Scumm *_vm;
int _top;
int _drawTop;
- int _left, _left2;
+ int _left, _startLeft;
byte _center;
int _right;
byte _color;
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- string.cpp 29 Nov 2002 15:13:42 -0000 1.50
+++ string.cpp 29 Nov 2002 18:27:35 -0000 1.51
@@ -242,7 +242,7 @@
charset._top = _string[0].ypos;
charset._left = _string[0].xpos;
- charset._left2 = _string[0].xpos;
+ charset._startLeft = _string[0].xpos;
charset._curId = _string[0].charset;
if (a && a->charset)
@@ -475,7 +475,7 @@
charset._top = _string[0].ypos;
charset._left = _string[0].xpos;
- charset._left2 = _string[0].xpos;
+ charset._startLeft = _string[0].xpos;
charset._right = _realWidth - 1;
charset._xpos2 = _string[0].xpos;
charset._ypos2 = _string[0].ypos;
@@ -523,7 +523,7 @@
charset._bufPos = 0;
charset._top = _string[0].ypos;
charset._left = _string[0].xpos;
- charset._left2 = _string[0].xpos;
+ charset._startLeft = _string[0].xpos;
charset._right = _realWidth - 1;
charset._xpos2 = _string[0].xpos;
charset._ypos2 = _string[0].ypos;
@@ -568,13 +568,13 @@
byte buf[256];
byte *charsetptr, *space;
int i;
- byte byte1 = 0, chr;
+ byte fontHeight = 0, chr;
uint color;
_msgPtrToAdd = buf;
_messagePtr = addMessageToStack(_messagePtr);
- charset._left2 = charset._left = _string[a].xpos;
+ charset._startLeft = charset._left = _string[a].xpos;
charset._top = _string[a].ypos;
charset._curId = _string[a].charset;
charset._center = _string[a].center;
@@ -595,7 +595,7 @@
else
charset._colorMap[i] = _charsetData[charset._curId][i];
- byte1 = charsetptr[1];
+ fontHeight = charsetptr[1];
}
_msgPtrToAdd = buf;
@@ -648,11 +648,11 @@
case 1:
case 8:
if (charset._center) {
- charset._left = charset._left2 - charset.getStringWidth(a, buf, i); // FIXME - shouldn't this be getStringWidth() / 2 ?!?
+ charset._left = charset._startLeft - charset.getStringWidth(a, buf, i);
} else {
- charset._left = charset._left2;
+ charset._left = charset._startLeft;
}
- charset._top += byte1;
+ charset._top += fontHeight;
break;
case 12:
color = buf[i] + (buf[i + 1] << 8);
@@ -872,7 +872,7 @@
_string[0].t_charset = charsetno;
_string[1].t_charset = charsetno;
- for (i = 0; i < 0x10; i++)
+ for (i = 0; i < 16; i++)
if (_features & GF_SMALL_HEADER)
charset._colorMap[i] = _charsetData[charset._curId][i - 12]; // FIXME - do we really want to access index -12 to -9 ?
else
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- verbs.cpp 29 Nov 2002 15:47:57 -0000 1.7
+++ verbs.cpp 29 Nov 2002 18:27:35 -0000 1.8
@@ -82,12 +82,12 @@
if (_verbMouseOver == verb)
return;
- if (_verbs[_verbMouseOver].type != 1) {
+ if (_verbs[_verbMouseOver].type != kImageVerbType) {
drawVerb(_verbMouseOver, 0);
_verbMouseOver = verb;
}
- if (_verbs[verb].type != 1 && _verbs[verb].hicolor) {
+ if (_verbs[verb].type != kImageVerbType && _verbs[verb].hicolor) {
drawVerb(verb, 1);
_verbMouseOver = verb;
}
@@ -126,7 +126,7 @@
vs = &_verbs[vrb];
if (!vs->saveid && vs->curmode && vs->verbid) {
- if (vs->type == 1) {
+ if (vs->type == kImageVerbType) {
drawVerbBitmap(vrb, vs->x, vs->y);
return;
}
Index: verbs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- verbs.h 29 Nov 2002 15:13:49 -0000 1.1
+++ verbs.h 29 Nov 2002 18:27:35 -0000 1.2
@@ -23,6 +23,11 @@
#include "scummsys.h"
+enum {
+ kTextVerbType = 0,
+ kImageVerbType = 1
+};
+
struct VerbSlot {
int16 x, y;
int16 right, bottom;
More information about the Scummvm-git-logs
mailing list