libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GLK: COMPREHEND: Fix looking at 4-d mirror in OO-Topos

Browse Source
This commit is contained in:
Paul Gilbert 2020-10-25 21:38:28 -07:00
parent b104ca3fd5
commit 43d25b567a
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/glk/comprehend/debugger_dumper.cpp
View File

@ -169,7 +169,11 @@ Common::String DebuggerDumper::dumpInstruction(ComprehendGame *game,
case OPCODE_SET_STRING_REPLACEMENT1:
case OPCODE_SET_STRING_REPLACEMENT2:
case OPCODE_SET_STRING_REPLACEMENT3:
line += Common::String::format(" %s", game->_replaceWords[instr->_operand[0] - 1].c_str());
str_index = instr->_operand[0] - 1;
if (str_index < 0 || str_index >= (int)game->_replaceWords.size())
warning("invalid string replacement index - %d", str_index);
else
line += Common::String::format(" %s", game->_replaceWords[str_index].c_str());
break;
default:

7
engines/glk/comprehend/game_data.cpp
View File

@ -94,8 +94,12 @@ void Word::load(FileBuffer *fb) {
// Decode
for (int j = 0; j < 6; j++)
_word[j] ^= 0x8a;
_word[j] = tolower((char)(_word[j] ^ 0xaa));
// Strip off trailing spaces
_word[6] = '\0';
for (int j = 5; j > 0 && _word[j] == ' '; --j)
_word[j] = '\0';
_index = fb->readByte();
_type = fb->readByte();
@ -157,6 +161,7 @@ void GameData::clearGame() {
_startRoom = 0;
_currentRoom = 0;
_currentReplaceWord = 0;
_wordFlags = 0;
_updateFlags = 0;
_colorTable = 0;
_itemCount = 0;

1
engines/glk/comprehend/game_data.h
View File

@ -396,6 +396,7 @@ public:
uint16 _variables[MAX_VARIABLES];
uint8 _currentReplaceWord;
uint8 _wordFlags;
uint _updateFlags;
Common::Array<WordMap> _wordMaps;

14
engines/glk/comprehend/game_opcodes.cpp
View File

@ -823,10 +823,18 @@ void ComprehendGameV2::execute_opcode(const Instruction *instr, const Sentence *
item->_longString = (instr->_operand[2] << 8) | instr->_operand[1];
break;
case OPCODE_SET_STRING_REPLACEMENT3:
warning("TODO: Figure out OPCODE_SET_STRING_REPLACEMENT3 offset");
_currentReplaceWord = instr->_operand[0] - 1;
case OPCODE_SET_STRING_REPLACEMENT3: {
int articleNum, bits = _wordFlags;
for (articleNum = 3; articleNum >= 0; --articleNum, bits <<= 1) {
if (bits >= 0x100)
break;
}
if (articleNum == -1)
articleNum = 2;
_currentReplaceWord = instr->_operand[0] + articleNum - 1;
break;
}
default:
ComprehendGameOpcodes::execute_opcode(instr, sentence, func_state);