aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/gob/inter_v1.cpp24
-rw-r--r--engines/gob/inter_v2.cpp54
-rw-r--r--engines/gob/inter_v4.cpp2
-rw-r--r--engines/gob/inter_v5.cpp2
-rw-r--r--engines/gob/inter_v6.cpp8
-rw-r--r--engines/gob/parse.cpp44
-rw-r--r--engines/gob/parse.h2
7 files changed, 68 insertions, 68 deletions
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index c2537d7eeb..a8202092ae 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -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->_parse->_inter_resStr); // PC CD version
+ _vm->_sound->cdPlay(_vm->_parse->_resultStr); // PC CD version
}
void Inter_v1::o1_getCDTrackPos() {
@@ -1340,7 +1340,7 @@ bool Inter_v1::o1_assign(OpFuncParams &params) {
if (srcType == TYPE_IMM_INT16)
WRITE_VARO_UINT8(dest, result);
else
- WRITE_VARO_STR(dest, _vm->_parse->_inter_resStr);
+ WRITE_VARO_STR(dest, _vm->_parse->_resultStr);
break;
}
@@ -1425,7 +1425,7 @@ bool Inter_v1::o1_loadTot(OpFuncParams &params) {
if ((*_vm->_global->_inter_execPtr & 0x80) != 0) {
_vm->_global->_inter_execPtr++;
evalExpr(0);
- strncpy0(buf, _vm->_parse->_inter_resStr, 15);
+ strncpy0(buf, _vm->_parse->_resultStr, 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 &params) {
evalExpr(0);
varOff = _vm->_parse->parseVarIndex();
- handle = _vm->_dataIO->openData(_vm->_parse->_inter_resStr);
+ handle = _vm->_dataIO->openData(_vm->_parse->_resultStr);
WRITE_VAR_OFFSET(varOff, handle);
if (handle >= 0)
_vm->_dataIO->closeData(handle);
else
- warning("File \"%s\" not found", _vm->_parse->_inter_resStr);
+ warning("File \"%s\" not found", _vm->_parse->_resultStr);
return false;
}
@@ -2094,7 +2094,7 @@ bool Inter_v1::o1_insertStr(OpFuncParams &params) {
pos = _vm->_parse->parseValExpr();
char *str = GET_VARO_FSTR(strVar);
- _vm->_util->insertStr(_vm->_parse->_inter_resStr, str, pos);
+ _vm->_util->insertStr(_vm->_parse->_resultStr, str, pos);
return false;
}
@@ -2119,7 +2119,7 @@ bool Inter_v1::o1_strstr(OpFuncParams &params) {
evalExpr(0);
resVar = _vm->_parse->parseVarIndex();
- char *res = strstr(GET_VARO_STR(strVar), _vm->_parse->_inter_resStr);
+ char *res = strstr(GET_VARO_STR(strVar), _vm->_parse->_resultStr);
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 &params) {
_vm->_dataIO->closeData(_vm->_game->_extHandle);
_vm->_draw->_fonts[index] =
- _vm->_util->loadFont(_vm->_parse->_inter_resStr);
+ _vm->_util->loadFont(_vm->_parse->_resultStr);
if (_vm->_game->_extHandle >= 0)
_vm->_game->_extHandle = _vm->_dataIO->openData(_vm->_game->_curExtFile);
@@ -2218,7 +2218,7 @@ bool Inter_v1::o1_readData(OpFuncParams &params) {
_vm->_dataIO->closeData(_vm->_game->_extHandle);
WRITE_VAR(1, 1);
- handle = _vm->_dataIO->openData(_vm->_parse->_inter_resStr);
+ handle = _vm->_dataIO->openData(_vm->_parse->_resultStr);
if (handle >= 0) {
DataStream *stream = _vm->_dataIO->openAsStream(handle, true);
@@ -2258,7 +2258,7 @@ bool Inter_v1::o1_writeData(OpFuncParams &params) {
size = _vm->_parse->parseValExpr();
offset = _vm->_parse->parseValExpr();
- warning("Attempted to write to file \"%s\"", _vm->_parse->_inter_resStr);
+ warning("Attempted to write to file \"%s\"", _vm->_parse->_resultStr);
WRITE_VAR(1, 0);
return false;
@@ -2267,8 +2267,8 @@ bool Inter_v1::o1_writeData(OpFuncParams &params) {
bool Inter_v1::o1_manageDataFile(OpFuncParams &params) {
evalExpr(0);
- if (_vm->_parse->_inter_resStr[0] != 0)
- _vm->_dataIO->openDataFile(_vm->_parse->_inter_resStr);
+ if (_vm->_parse->_resultStr[0] != 0)
+ _vm->_dataIO->openDataFile(_vm->_parse->_resultStr);
else
_vm->_dataIO->closeDataFile();
return false;
diff --git a/engines/gob/inter_v2.cpp b/engines/gob/inter_v2.cpp
index 86598dde30..f2f1281f1c 100644
--- a/engines/gob/inter_v2.cpp
+++ b/engines/gob/inter_v2.cpp
@@ -1058,7 +1058,7 @@ void Inter_v2::o2_playCDTrack() {
_vm->_draw->blitInvalidated();
evalExpr(0);
- _vm->_sound->cdPlay(_vm->_parse->_inter_resStr);
+ _vm->_sound->cdPlay(_vm->_parse->_resultStr);
}
void Inter_v2::o2_waitCDTrackEnd() {
@@ -1076,7 +1076,7 @@ void Inter_v2::o2_readLIC() {
char path[40];
evalExpr(0);
- strncpy0(path, _vm->_parse->_inter_resStr, 35);
+ strncpy0(path, _vm->_parse->_resultStr, 35);
strcat(path, ".LIC");
_vm->_sound->cdLoadLIC(path);
@@ -1124,7 +1124,7 @@ void Inter_v2::o2_totSub() {
if (length & 0x80) {
evalExpr(0);
- strcpy(totFile, _vm->_parse->_inter_resStr);
+ strcpy(totFile, _vm->_parse->_resultStr);
} else {
for (i = 0; i < length; i++)
totFile[i] = (char) *_vm->_global->_inter_execPtr++;
@@ -1507,8 +1507,8 @@ void Inter_v2::o2_playImd() {
bool close;
evalExpr(0);
- _vm->_parse->_inter_resStr[8] = 0;
- strncpy0(imd, _vm->_parse->_inter_resStr, 127);
+ _vm->_parse->_resultStr[8] = 0;
+ strncpy0(imd, _vm->_parse->_resultStr, 127);
x = _vm->_parse->parseValExpr();
y = _vm->_parse->parseValExpr();
@@ -1521,7 +1521,7 @@ void Inter_v2::o2_playImd() {
palCmd = 1 << (flags & 0x3F);
debugC(1, kDebugVideo, "Playing video \"%s\" @ %d+%d, frames %d - %d, "
- "paletteCmd %d (%d - %d), flags %X", _vm->_parse->_inter_resStr, x, y,
+ "paletteCmd %d (%d - %d), flags %X", _vm->_parse->_resultStr, x, y,
startFrame, lastFrame, palCmd, palStart, palEnd, flags);
if ((imd[0] != 0) && !_vm->_vidPlayer->primaryOpen(imd, x, y, flags)) {
@@ -1560,10 +1560,10 @@ void Inter_v2::o2_getImdInfo() {
// WORKAROUND: The nut rolling animation in the administration center
// in Woodruff is called "noixroul", but the scripts think it's "noixroule".
if ((_vm->getGameType() == kGameTypeWoodruff) &&
- (!scumm_stricmp(_vm->_parse->_inter_resStr, "noixroule")))
- strcpy(_vm->_parse->_inter_resStr, "noixroul");
+ (!scumm_stricmp(_vm->_parse->_resultStr, "noixroule")))
+ strcpy(_vm->_parse->_resultStr, "noixroul");
- _vm->_vidPlayer->writeVideoInfo(_vm->_parse->_inter_resStr, varX, varY,
+ _vm->_vidPlayer->writeVideoInfo(_vm->_parse->_resultStr, varX, varY,
varFrames, varWidth, varHeight);
}
@@ -1571,7 +1571,7 @@ void Inter_v2::o2_openItk() {
char fileName[32];
evalExpr(0);
- strncpy0(fileName, _vm->_parse->_inter_resStr, 27);
+ strncpy0(fileName, _vm->_parse->_resultStr, 27);
if (!strchr(fileName, '.'))
strcat(fileName, ".ITK");
@@ -1628,7 +1628,7 @@ bool Inter_v2::o2_assign(OpFuncParams &params) {
if (srcType == TYPE_IMM_INT16)
WRITE_VARO_UINT8(dest, result);
else
- WRITE_VARO_STR(dest, _vm->_parse->_inter_resStr);
+ WRITE_VARO_STR(dest, _vm->_parse->_resultStr);
break;
}
}
@@ -1858,17 +1858,17 @@ bool Inter_v2::o2_checkData(OpFuncParams &params) {
size = -1;
handle = 1;
- mode = _vm->_saveLoad->getSaveMode(_vm->_parse->_inter_resStr);
+ mode = _vm->_saveLoad->getSaveMode(_vm->_parse->_resultStr);
if (mode == SaveLoad::kSaveModeNone) {
- handle = _vm->_dataIO->openData(_vm->_parse->_inter_resStr);
+ handle = _vm->_dataIO->openData(_vm->_parse->_resultStr);
if (handle >= 0) {
_vm->_dataIO->closeData(handle);
- size = _vm->_dataIO->getDataSize(_vm->_parse->_inter_resStr);
+ size = _vm->_dataIO->getDataSize(_vm->_parse->_resultStr);
} else
- warning("File \"%s\" not found", _vm->_parse->_inter_resStr);
+ warning("File \"%s\" not found", _vm->_parse->_resultStr);
} else if (mode == SaveLoad::kSaveModeSave)
- size = _vm->_saveLoad->getSize(_vm->_parse->_inter_resStr);
+ size = _vm->_saveLoad->getSize(_vm->_parse->_resultStr);
else if (mode == SaveLoad::kSaveModeExists)
size = 23;
@@ -1876,7 +1876,7 @@ bool Inter_v2::o2_checkData(OpFuncParams &params) {
handle = -1;
debugC(2, kDebugFileIO, "Requested size of file \"%s\": %d",
- _vm->_parse->_inter_resStr, size);
+ _vm->_parse->_resultStr, size);
WRITE_VAR_OFFSET(varOff, handle);
WRITE_VAR(16, (uint32) size);
@@ -1901,12 +1901,12 @@ bool Inter_v2::o2_readData(OpFuncParams &params) {
retSize = 0;
debugC(2, kDebugFileIO, "Read from file \"%s\" (%d, %d bytes at %d)",
- _vm->_parse->_inter_resStr, dataVar, size, offset);
+ _vm->_parse->_resultStr, dataVar, size, offset);
- mode = _vm->_saveLoad->getSaveMode(_vm->_parse->_inter_resStr);
+ mode = _vm->_saveLoad->getSaveMode(_vm->_parse->_resultStr);
if (mode == SaveLoad::kSaveModeSave) {
WRITE_VAR(1, 1);
- if (_vm->_saveLoad->load(_vm->_parse->_inter_resStr, dataVar, size, offset))
+ if (_vm->_saveLoad->load(_vm->_parse->_resultStr, dataVar, size, offset))
WRITE_VAR(1, 0);
return false;
} else if (mode == SaveLoad::kSaveModeIgnore)
@@ -1914,7 +1914,7 @@ bool Inter_v2::o2_readData(OpFuncParams &params) {
if (size < 0) {
warning("Attempted to read a raw sprite from file \"%s\"",
- _vm->_parse->_inter_resStr);
+ _vm->_parse->_resultStr);
return false ;
} else if (size == 0) {
dataVar = 0;
@@ -1923,13 +1923,13 @@ bool Inter_v2::o2_readData(OpFuncParams &params) {
buf = _variables->getAddressOff8(dataVar);
- if (_vm->_parse->_inter_resStr[0] == 0) {
+ if (_vm->_parse->_resultStr[0] == 0) {
WRITE_VAR(1, size);
return false;
}
WRITE_VAR(1, 1);
- handle = _vm->_dataIO->openData(_vm->_parse->_inter_resStr);
+ handle = _vm->_dataIO->openData(_vm->_parse->_resultStr);
if (handle < 0)
return false;
@@ -1971,16 +1971,16 @@ bool Inter_v2::o2_writeData(OpFuncParams &params) {
offset = _vm->_parse->_resultInt;
debugC(2, kDebugFileIO, "Write to file \"%s\" (%d, %d bytes at %d)",
- _vm->_parse->_inter_resStr, dataVar, size, offset);
+ _vm->_parse->_resultStr, dataVar, size, offset);
WRITE_VAR(1, 1);
- mode = _vm->_saveLoad->getSaveMode(_vm->_parse->_inter_resStr);
+ mode = _vm->_saveLoad->getSaveMode(_vm->_parse->_resultStr);
if (mode == SaveLoad::kSaveModeSave) {
- if (_vm->_saveLoad->save(_vm->_parse->_inter_resStr, dataVar, size, offset))
+ if (_vm->_saveLoad->save(_vm->_parse->_resultStr, dataVar, size, offset))
WRITE_VAR(1, 0);
} else if (mode == SaveLoad::kSaveModeNone)
- warning("Attempted to write to file \"%s\"", _vm->_parse->_inter_resStr);
+ warning("Attempted to write to file \"%s\"", _vm->_parse->_resultStr);
return false;
}
diff --git a/engines/gob/inter_v4.cpp b/engines/gob/inter_v4.cpp
index 812ff71495..1f7ce5757f 100644
--- a/engines/gob/inter_v4.cpp
+++ b/engines/gob/inter_v4.cpp
@@ -810,7 +810,7 @@ void Inter_v4::o4_playVmdOrMusic() {
bool close;
evalExpr(0);
- strncpy0(fileName, _vm->_parse->_inter_resStr, 127);
+ strncpy0(fileName, _vm->_parse->_resultStr, 127);
// WORKAROUND: The nut rolling animation in the administration center
// in Woodruff is called "noixroul", but the scripts think it's "noixroule".
diff --git a/engines/gob/inter_v5.cpp b/engines/gob/inter_v5.cpp
index 236af5be6e..dcd7113fcc 100644
--- a/engines/gob/inter_v5.cpp
+++ b/engines/gob/inter_v5.cpp
@@ -675,7 +675,7 @@ const char *Inter_v5::getOpcodeGoblinDesc(int i) {
void Inter_v5::o5_deleteFile() {
evalExpr(0);
- warning("Dynasty Stub: deleteFile \"%s\"", _vm->_parse->_inter_resStr);
+ warning("Dynasty Stub: deleteFile \"%s\"", _vm->_parse->_resultStr);
}
void Inter_v5::o5_initScreen() {
diff --git a/engines/gob/inter_v6.cpp b/engines/gob/inter_v6.cpp
index d6a4addf5c..bc89094662 100644
--- a/engines/gob/inter_v6.cpp
+++ b/engines/gob/inter_v6.cpp
@@ -666,7 +666,7 @@ void Inter_v6::o6_totSub() {
if (length & 0x80) {
evalExpr(0);
- strcpy(totFile, _vm->_parse->_inter_resStr);
+ strcpy(totFile, _vm->_parse->_resultStr);
} else {
for (i = 0; i < length; i++)
totFile[i] = (char) *_vm->_global->_inter_execPtr++;
@@ -694,7 +694,7 @@ void Inter_v6::o6_playVmdOrMusic() {
bool close;
evalExpr(0);
- strncpy0(fileName, _vm->_parse->_inter_resStr, 127);
+ strncpy0(fileName, _vm->_parse->_resultStr, 127);
x = _vm->_parse->parseValExpr();
y = _vm->_parse->parseValExpr();
@@ -760,7 +760,7 @@ void Inter_v6::o6_openItk() {
char fileName[32];
evalExpr(0);
- strncpy0(fileName, _vm->_parse->_inter_resStr, 27);
+ strncpy0(fileName, _vm->_parse->_resultStr, 27);
if (!strchr(fileName, '.'))
strcat(fileName, ".ITK");
@@ -912,7 +912,7 @@ bool Inter_v6::o6_assign(OpFuncParams &params) {
if (srcType == TYPE_IMM_INT16)
WRITE_VARO_UINT8(dest, result);
else
- WRITE_VARO_STR(dest, _vm->_parse->_inter_resStr);
+ WRITE_VARO_STR(dest, _vm->_parse->_resultStr);
break;
}
}
diff --git a/engines/gob/parse.cpp b/engines/gob/parse.cpp
index f5c766ed3e..7b2cccf199 100644
--- a/engines/gob/parse.cpp
+++ b/engines/gob/parse.cpp
@@ -34,7 +34,7 @@
namespace Gob {
Parse::Parse(GobEngine *vm) : _vm(vm) {
- _inter_resStr[0] = 0;
+ _resultStr[0] = 0;
_resultInt = 0;
}
@@ -49,7 +49,7 @@ int32 Parse::encodePtr(byte *ptr, int type) {
offset = ptr - ((byte *) _vm->_inter->_variables->getAddressOff8(0));
break;
case kResStr:
- offset = ptr - ((byte *) _vm->_parse->_inter_resStr);
+ offset = ptr - ((byte *) _vm->_parse->_resultStr);
break;
default:
error("Parse::encodePtr(): Unknown pointer type");
@@ -69,7 +69,7 @@ byte *Parse::decodePtr(int32 n) {
ptr = (byte *) _vm->_inter->_variables->getAddressOff8(0);
break;
case kResStr:
- ptr = (byte *) _vm->_parse->_inter_resStr;
+ ptr = (byte *) _vm->_parse->_resultStr;
break;
default:
error("Parse::decodePtr(): Unknown pointer type");
@@ -465,11 +465,11 @@ int Parse::cmpHelper(byte *operPtr, int32 *valPtr) {
if (type == OP_LOAD_IMM_INT16) {
cmpTemp = (int)valPtr[-3] - (int)valPtr[-1];
} else if (type == OP_LOAD_IMM_STR) {
- if ((char *)decodePtr(valPtr[-3]) != _vm->_parse->_inter_resStr) {
- strcpy(_vm->_parse->_inter_resStr, (char *)decodePtr(valPtr[-3]));
- valPtr[-3] = encodePtr((byte *) _vm->_parse->_inter_resStr, kResStr);
+ if ((char *)decodePtr(valPtr[-3]) != _vm->_parse->_resultStr) {
+ strcpy(_vm->_parse->_resultStr, (char *)decodePtr(valPtr[-3]));
+ valPtr[-3] = encodePtr((byte *) _vm->_parse->_resultStr, kResStr);
}
- cmpTemp = strcmp(_vm->_parse->_inter_resStr, (char *)decodePtr(valPtr[-1]));
+ cmpTemp = strcmp(_vm->_parse->_resultStr, (char *)decodePtr(valPtr[-1]));
}
return cmpTemp;
@@ -773,11 +773,11 @@ void Parse::simpleArithmetic1(byte *&operPtr, int32 *&valPtr, int16 &stkPos) {
switch (operPtr[-1]) {
case OP_ADD:
if (operPtr[-2] == OP_LOAD_IMM_STR) {
- if ((char *) decodePtr(valPtr[-2]) != _vm->_parse->_inter_resStr) {
- strcpy(_vm->_parse->_inter_resStr, (char *) decodePtr(valPtr[-2]));
- valPtr[-2] = encodePtr((byte *) _vm->_parse->_inter_resStr, kResStr);
+ if ((char *) decodePtr(valPtr[-2]) != _vm->_parse->_resultStr) {
+ strcpy(_vm->_parse->_resultStr, (char *) decodePtr(valPtr[-2]));
+ valPtr[-2] = encodePtr((byte *) _vm->_parse->_resultStr, kResStr);
}
- strcat(_vm->_parse->_inter_resStr, (char *) decodePtr(valPtr[0]));
+ strcat(_vm->_parse->_resultStr, (char *) decodePtr(valPtr[0]));
stkPos -= 2;
operPtr -= 2;
valPtr -= 2;
@@ -873,12 +873,12 @@ bool Parse::complexArithmetic(byte *&operPtr, int32 *&valPtr, int16 &stkPos,
if (operStack[brackStart] == OP_LOAD_IMM_INT16) {
values[brackStart] += valPtr[-1];
} else if (operStack[brackStart] == OP_LOAD_IMM_STR) {
- if ((char *) decodePtr(values[brackStart]) != _vm->_parse->_inter_resStr) {
- strcpy(_vm->_parse->_inter_resStr, (char *) decodePtr(values[brackStart]));
+ if ((char *) decodePtr(values[brackStart]) != _vm->_parse->_resultStr) {
+ strcpy(_vm->_parse->_resultStr, (char *) decodePtr(values[brackStart]));
values[brackStart] =
- encodePtr((byte *) _vm->_parse->_inter_resStr, kResStr);
+ encodePtr((byte *) _vm->_parse->_resultStr, kResStr);
}
- strcat(_vm->_parse->_inter_resStr, (char *) decodePtr(valPtr[-1]));
+ strcat(_vm->_parse->_resultStr, (char *) decodePtr(valPtr[-1]));
}
stkPos -= 2;
operPtr -= 2;
@@ -996,7 +996,7 @@ bool Parse::complexArithmetic(byte *&operPtr, int32 *&valPtr, int16 &stkPos,
return false;
}
-// Assign the result to the appropriate _inter_res* variable
+// Assign the result to the appropriate _result variable
void Parse::getResult(byte operation, int32 value, byte *type) {
if (type != 0)
*type = operation;
@@ -1012,8 +1012,8 @@ void Parse::getResult(byte operation, int32 value, byte *type) {
break;
case OP_LOAD_IMM_STR:
- if ((char *) decodePtr(value) != _vm->_parse->_inter_resStr)
- strcpy(_vm->_parse->_inter_resStr, (char *) decodePtr(value));
+ if ((char *) decodePtr(value) != _vm->_parse->_resultStr)
+ strcpy(_vm->_parse->_resultStr, (char *) decodePtr(value));
break;
case OP_LOAD_VAR_INT32:
@@ -1165,11 +1165,11 @@ int16 Parse::parseExpr(byte stopToken, byte *type) {
if (operPtr[-3] == OP_LOAD_IMM_INT16) {
valPtr[-3] += valPtr[-1];
} else if (operPtr[-3] == OP_LOAD_IMM_STR) {
- if ((char *) decodePtr(valPtr[-3]) != _vm->_parse->_inter_resStr) {
- strcpy(_vm->_parse->_inter_resStr, (char *) decodePtr(valPtr[-3]));
- valPtr[-3] = encodePtr((byte *) _vm->_parse->_inter_resStr, kResStr);
+ if ((char *) decodePtr(valPtr[-3]) != _vm->_parse->_resultStr) {
+ strcpy(_vm->_parse->_resultStr, (char *) decodePtr(valPtr[-3]));
+ valPtr[-3] = encodePtr((byte *) _vm->_parse->_resultStr, kResStr);
}
- strcat(_vm->_parse->_inter_resStr, (char *) decodePtr(valPtr[-1]));
+ strcat(_vm->_parse->_resultStr, (char *) decodePtr(valPtr[-1]));
}
stkPos -= 2;
operPtr -= 2;
diff --git a/engines/gob/parse.h b/engines/gob/parse.h
index dc95e71c02..6ef99ec84c 100644
--- a/engines/gob/parse.h
+++ b/engines/gob/parse.h
@@ -118,7 +118,7 @@ public:
Parse(GobEngine *vm);
virtual ~Parse() {}
- char _inter_resStr[200];
+ char _resultStr[200];
int32 _resultInt;
private:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 11:35:35 +0000