thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed StringTab::backup to StringTab::_default, as that describes better what it does

Browse source 
svn-id: r13476
This commit is contained in:
Max Horn 2004-04-05 23:54:58 +00:00
parent fbd9340768
commit 17fe0497f5
9 changed files with 47 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scumm/script_v6.cpp
View file

@ -949,7 +949,7 @@ void ScummEngine_v6::o6_cursorCommand() {
case 0x9D: // SO_CHARSET_COLOR
getStackList(args, ARRAYSIZE(args));
for (i = 0; i < 16; i++)
_charsetColorMap[i] = _charsetData[_string[1].backup.charset][i] = (unsigned char)args[i];
_charsetColorMap[i] = _charsetData[_string[1]._default.charset][i] = (unsigned char)args[i];
break;
case 0xD6: // SO_CURSOR_TRANSPARENT Set cursor transparent color
makeCursorColorTransparent(pop());
@ -1925,7 +1925,7 @@ void ScummEngine_v6::o6_verbOps() {
vs->hicolor = 0;
vs->dimcolor = 8;
vs->type = kTextVerbType;
vs->charset_nr = _string[0].backup.charset;
vs->charset_nr = _string[0]._default.charset;
vs->curmode = 0;
vs->saveid = 0;
vs->key = 0;
@ -2294,7 +2294,7 @@ void ScummEngine_v6::o6_printEgo() {
void ScummEngine_v6::o6_talkActor() {
_actorToPrintStrFor = pop();
_string[0].restoreString();
_string[0].loadDefault();
actorTalk(_scriptPointer);
_scriptPointer += resStrLen(_scriptPointer) + 1;
@ -3119,12 +3119,12 @@ void ScummEngine_v6::decodeParseString(int m, int n) {
break;
case 0xFE:
_string[m].restoreString();
_string[m].loadDefault();
if (n)
_actorToPrintStrFor = pop();
break;
case 0xFF:
_string[m].backupString();
_string[m].saveDefault();
break;
default:
error("decodeParseString: default case 0x%x", b);