[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.151,1.152 script_v8.cpp,2.176,2.177 scumm.h,1.236,1.237 string.cpp,1.128,1.129
Max Horn
fingolfin at users.sourceforge.net
Mon Jun 2 16:19:08 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15151
Modified Files:
script_v6.cpp script_v8.cpp scumm.h string.cpp
Log Message:
moved blast text code to string.cpp
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- script_v6.cpp 2 Jun 2003 23:06:34 -0000 1.151
+++ script_v6.cpp 2 Jun 2003 23:18:50 -0000 1.152
@@ -2479,7 +2479,7 @@
break;
case 16:
case 17:{
- byte *message = getStringAddressVar(VAR_STRING2DRAW);
+ const byte *message = getStringAddressVar(VAR_STRING2DRAW);
if (_gameId == GID_DIG) {
byte buf_input[300], buf_output[300], buf_trans[300], *ptr = buf_input;
char *t_ptr = (char *)ptr;
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.176
retrieving revision 2.177
diff -u -d -r2.176 -r2.177
--- script_v8.cpp 2 Jun 2003 02:25:23 -0000 2.176
+++ script_v8.cpp 2 Jun 2003 23:18:51 -0000 2.177
@@ -546,77 +546,11 @@
}
break;
// case 0xD2: // SO_PRINT_WRAP Set print wordwrap
-// error("decodeParseString: SO_PRINT_MUMBLE");
+// error("decodeParseString: SO_PRINT_WRAP");
// break;
default:
error("decodeParseString: default case 0x%x", b);
}
-}
-
-void Scumm::enqueueText(byte *text, int x, int y, byte color, byte charset, bool center) {
- BlastText &bt = _blastTextQueue[_blastTextQueuePos++];
- assert(_blastTextQueuePos <= 32);
-
- strcpy((char *)bt.text, (const char *)text);
- bt.xpos = x;
- bt.ypos = y;
- bt.color = color;
- bt.charset = charset;
- bt.center = center;
-}
-
-void Scumm::drawBlastTexts() {
- // FIXME
-
- byte *buf;
- byte c;
- int i;
-
- _charset->_ignoreCharsetMask = true;
- for (i = 0; i < _blastTextQueuePos; i++) {
-
- buf = _blastTextQueue[i].text;
-
- _charset->_top = _blastTextQueue[i].ypos;
- _charset->_startLeft = _charset->_left = _blastTextQueue[i].xpos;
- _charset->_right = _screenWidth - 1;
- _charset->_center = _blastTextQueue[i].center;
- _charset->setColor(_blastTextQueue[i].color);
- _charset->_disableOffsX = _charset->_firstChar = true;
- _charset->setCurID(_blastTextQueue[i].charset);
- _charset->_nextLeft = _blastTextQueue[i].xpos;
- _charset->_nextTop = _blastTextQueue[i].ypos;
-
- // Center text if necessary
- if (_charset->_center) {
- _charset->_nextLeft -= _charset->getStringWidth(0, buf) >> 1;
- if (_charset->_nextLeft < 0)
- _charset->_nextLeft = 0;
- }
-
- do {
- c = *buf++;
- if (c != 0 && c != 0xFF) {
- _charset->_left = _charset->_nextLeft;
- _charset->_top = _charset->_nextTop;
- _charset->printChar(c);
- _charset->_nextLeft = _charset->_left;
- _charset->_nextTop = _charset->_top;
- }
- } while (c);
-
- _blastTextQueue[i].rect = _charset->_str;
- }
- _charset->_ignoreCharsetMask = false;
-}
-
-void Scumm::removeBlastTexts() {
- int i;
-
- for (i = 0; i < _blastTextQueuePos; i++) {
- restoreBG(_blastTextQueue[i].rect);
- }
- _blastTextQueuePos = 0;
}
void Scumm_v8::o8_mod() {
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- scumm.h 2 Jun 2003 18:15:08 -0000 1.236
+++ scumm.h 2 Jun 2003 23:18:51 -0000 1.237
@@ -911,7 +911,7 @@
int _blastTextQueuePos;
BlastText _blastTextQueue[32]; // FIXME - how many blast texts can there be at once?
- void enqueueText(byte *text, int x, int y, byte color, byte charset, bool center);
+ void enqueueText(const byte *text, int x, int y, byte color, byte charset, bool center);
void drawBlastTexts();
void removeBlastTexts();
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- string.cpp 1 Jun 2003 17:29:45 -0000 1.128
+++ string.cpp 2 Jun 2003 23:18:52 -0000 1.129
@@ -736,6 +736,72 @@
_charsetColorMap[i] = _charsetData[_charset->getCurID()][i];
}
+void Scumm::enqueueText(const byte *text, int x, int y, byte color, byte charset, bool center) {
+ BlastText &bt = _blastTextQueue[_blastTextQueuePos++];
+ assert(_blastTextQueuePos <= 32);
+
+ strcpy((char *)bt.text, (const char *)text);
+ bt.xpos = x;
+ bt.ypos = y;
+ bt.color = color;
+ bt.charset = charset;
+ bt.center = center;
+}
+
+void Scumm::drawBlastTexts() {
+ // FIXME
+
+ byte *buf;
+ byte c;
+ int i;
+
+ _charset->_ignoreCharsetMask = true;
+ for (i = 0; i < _blastTextQueuePos; i++) {
+
+ buf = _blastTextQueue[i].text;
+
+ _charset->_top = _blastTextQueue[i].ypos;
+ _charset->_startLeft = _charset->_left = _blastTextQueue[i].xpos;
+ _charset->_right = _screenWidth - 1;
+ _charset->_center = _blastTextQueue[i].center;
+ _charset->setColor(_blastTextQueue[i].color);
+ _charset->_disableOffsX = _charset->_firstChar = true;
+ _charset->setCurID(_blastTextQueue[i].charset);
+ _charset->_nextLeft = _blastTextQueue[i].xpos;
+ _charset->_nextTop = _blastTextQueue[i].ypos;
+
+ // Center text if necessary
+ if (_charset->_center) {
+ _charset->_nextLeft -= _charset->getStringWidth(0, buf) >> 1;
+ if (_charset->_nextLeft < 0)
+ _charset->_nextLeft = 0;
+ }
+
+ do {
+ c = *buf++;
+ if (c != 0 && c != 0xFF) {
+ _charset->_left = _charset->_nextLeft;
+ _charset->_top = _charset->_nextTop;
+ _charset->printChar(c);
+ _charset->_nextLeft = _charset->_left;
+ _charset->_nextTop = _charset->_top;
+ }
+ } while (c);
+
+ _blastTextQueue[i].rect = _charset->_str;
+ }
+ _charset->_ignoreCharsetMask = false;
+}
+
+void Scumm::removeBlastTexts() {
+ int i;
+
+ for (i = 0; i < _blastTextQueuePos; i++) {
+ restoreBG(_blastTextQueue[i].rect);
+ }
+ _blastTextQueuePos = 0;
+}
+
int indexCompare(const void *p1, const void *p2) {
const LangIndexNode *i1 = (const LangIndexNode *) p1;
const LangIndexNode *i2 = (const LangIndexNode *) p2;
More information about the Scummvm-git-logs
mailing list