aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v8.cpp
diff options
context:
space:
mode:
authorMax Horn2004-04-03 19:41:31 +0000
committerMax Horn2004-04-03 19:41:31 +0000
commit6aa6b49ed57cc5900baaff6698bad062ea2f198b (patch)
treea52cb80d6b9345d39f779ea2fab58462ead47892 /scumm/script_v8.cpp
parent8f6ae7973e895e40ecbf84afa95a0aa81508113b (diff)
downloadscummvm-rg350-6aa6b49ed57cc5900baaff6698bad062ea2f198b.tar.gz
scummvm-rg350-6aa6b49ed57cc5900baaff6698bad062ea2f198b.tar.bz2
scummvm-rg350-6aa6b49ed57cc5900baaff6698bad062ea2f198b.zip
cleanup StringTab stuff
svn-id: r13448
Diffstat (limited to 'scumm/script_v8.cpp')
-rw-r--r--scumm/script_v8.cpp15
1 files changed, 4 insertions, 11 deletions
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index 92ef66d155..743c751f34 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -472,19 +472,12 @@ void ScummEngine_v8::decodeParseString(int m, int n) {
switch (b) {
case 0xC8: // SO_PRINT_BASEOP
- setStringVars(m);
+ _string[m].restoreString();
if (n)
_actorToPrintStrFor = pop();
break;
case 0xC9: // SO_PRINT_END
- _string[m].t_xpos = _string[m].xpos;
- _string[m].t_ypos = _string[m].ypos;
- _string[m].t_center = _string[m].center;
- _string[m].t_overhead = _string[m].overhead;
- _string[m].t_no_talk_anim = _string[m].no_talk_anim;
- _string[m].t_right = _string[m].right;
- _string[m].t_color = _string[m].color;
- _string[m].t_charset = _string[m].charset;
+ _string[m].backupString();
break;
case 0xCA: // SO_PRINT_AT
_string[m].ypos = pop();
@@ -769,7 +762,7 @@ void ScummEngine_v8::o8_cursorCommand() {
case 0xE8: // SO_CHARSET_COLOR
getStackList(args, ARRAYSIZE(args));
for (i = 0; i < 16; i++)
- _charsetColorMap[i] = _charsetData[_string[1].t_charset][i] = (unsigned char)args[i];
+ _charsetColorMap[i] = _charsetData[_string[1].backup.charset][i] = (unsigned char)args[i];
break;
case 0xE9: // SO_CURSOR_PUT
{
@@ -1151,7 +1144,7 @@ void ScummEngine_v8::o8_verbOps() {
vs->hicolor = 0;
vs->dimcolor = 8;
vs->type = kTextVerbType;
- vs->charset_nr = _string[0].t_charset;
+ vs->charset_nr = _string[0].backup.charset;
vs->curmode = 0;
vs->saveid = 0;
vs->key = 0;