diff options
Diffstat (limited to 'engines/gob/inter_v1.cpp')
-rw-r--r-- | engines/gob/inter_v1.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 1df261d7ab..7571f6d10b 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -738,7 +738,7 @@ void Inter_v1::checkSwitchTable(byte **ppExec) { if (_terminate) return; - if (_vm->_global->_inter_resVal == value) { + if (_vm->_parse->_inter_resVal == value) { found = true; notFound = false; } @@ -1079,7 +1079,7 @@ void Inter_v1::o1_loadCurLayer() { void Inter_v1::o1_playCDTrack() { evalExpr(0); _vm->_sound->adlibPlayBgMusic(); // Mac version - _vm->_sound->cdPlay(_vm->_global->_inter_resStr); // PC CD version + _vm->_sound->cdPlay(_vm->_parse->_inter_resStr); // PC CD version } void Inter_v1::o1_getCDTrackPos() { @@ -1332,7 +1332,7 @@ bool Inter_v1::o1_assign(OpFuncParams ¶ms) { switch (destType) { case TYPE_VAR_INT32: case TYPE_ARRAY_INT32: - WRITE_VAR_OFFSET(dest, _vm->_global->_inter_resVal); + WRITE_VAR_OFFSET(dest, _vm->_parse->_inter_resVal); break; case TYPE_VAR_STR: @@ -1340,7 +1340,7 @@ bool Inter_v1::o1_assign(OpFuncParams ¶ms) { if (srcType == TYPE_IMM_INT16) WRITE_VARO_UINT8(dest, result); else - WRITE_VARO_STR(dest, _vm->_global->_inter_resStr); + WRITE_VARO_STR(dest, _vm->_parse->_inter_resStr); break; } @@ -1425,7 +1425,7 @@ bool Inter_v1::o1_loadTot(OpFuncParams ¶ms) { if ((*_vm->_global->_inter_execPtr & 0x80) != 0) { _vm->_global->_inter_execPtr++; evalExpr(0); - strncpy0(buf, _vm->_global->_inter_resStr, 15); + strncpy0(buf, _vm->_parse->_inter_resStr, 15); } else { size = (int8) *_vm->_global->_inter_execPtr++; for (int i = 0; i < size; i++) @@ -2067,13 +2067,13 @@ bool Inter_v1::o1_checkData(OpFuncParams ¶ms) { evalExpr(0); varOff = _vm->_parse->parseVarIndex(); - handle = _vm->_dataIO->openData(_vm->_global->_inter_resStr); + handle = _vm->_dataIO->openData(_vm->_parse->_inter_resStr); WRITE_VAR_OFFSET(varOff, handle); if (handle >= 0) _vm->_dataIO->closeData(handle); else - warning("File \"%s\" not found", _vm->_global->_inter_resStr); + warning("File \"%s\" not found", _vm->_parse->_inter_resStr); return false; } @@ -2094,7 +2094,7 @@ bool Inter_v1::o1_insertStr(OpFuncParams ¶ms) { pos = _vm->_parse->parseValExpr(); char *str = GET_VARO_FSTR(strVar); - _vm->_util->insertStr(_vm->_global->_inter_resStr, str, pos); + _vm->_util->insertStr(_vm->_parse->_inter_resStr, str, pos); return false; } @@ -2119,7 +2119,7 @@ bool Inter_v1::o1_strstr(OpFuncParams ¶ms) { evalExpr(0); resVar = _vm->_parse->parseVarIndex(); - char *res = strstr(GET_VARO_STR(strVar), _vm->_global->_inter_resStr); + char *res = strstr(GET_VARO_STR(strVar), _vm->_parse->_inter_resStr); pos = res ? (res - (GET_VARO_STR(strVar))) : -1; WRITE_VAR_OFFSET(resVar, pos); return false; @@ -2185,7 +2185,7 @@ bool Inter_v1::o1_loadFont(OpFuncParams ¶ms) { _vm->_dataIO->closeData(_vm->_game->_extHandle); _vm->_draw->_fonts[index] = - _vm->_util->loadFont(_vm->_global->_inter_resStr); + _vm->_util->loadFont(_vm->_parse->_inter_resStr); if (_vm->_game->_extHandle >= 0) _vm->_game->_extHandle = _vm->_dataIO->openData(_vm->_game->_curExtFile); @@ -2218,7 +2218,7 @@ bool Inter_v1::o1_readData(OpFuncParams ¶ms) { _vm->_dataIO->closeData(_vm->_game->_extHandle); WRITE_VAR(1, 1); - handle = _vm->_dataIO->openData(_vm->_global->_inter_resStr); + handle = _vm->_dataIO->openData(_vm->_parse->_inter_resStr); if (handle >= 0) { DataStream *stream = _vm->_dataIO->openAsStream(handle, true); @@ -2258,7 +2258,7 @@ bool Inter_v1::o1_writeData(OpFuncParams ¶ms) { size = _vm->_parse->parseValExpr(); offset = _vm->_parse->parseValExpr(); - warning("Attempted to write to file \"%s\"", _vm->_global->_inter_resStr); + warning("Attempted to write to file \"%s\"", _vm->_parse->_inter_resStr); WRITE_VAR(1, 0); return false; @@ -2267,8 +2267,8 @@ bool Inter_v1::o1_writeData(OpFuncParams ¶ms) { bool Inter_v1::o1_manageDataFile(OpFuncParams ¶ms) { evalExpr(0); - if (_vm->_global->_inter_resStr[0] != 0) - _vm->_dataIO->openDataFile(_vm->_global->_inter_resStr); + if (_vm->_parse->_inter_resStr[0] != 0) + _vm->_dataIO->openDataFile(_vm->_parse->_inter_resStr); else _vm->_dataIO->closeDataFile(); return false; |