libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 03:40:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GLK: COMPREHEND: Fix opcode map definition

Browse Source
This commit is contained in:
Paul Gilbert 2020-05-29 21:16:33 -07:00
parent 16c36841aa
commit fbf8e0a23b
6 changed files with 174 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/glk/comprehend/dump_game_data.cpp
View File

@ -126,7 +126,7 @@ void dump_instruction(ComprehendGame *game,
func_state->or_count, func_state->_and,
func_state->test_result, func_state->else_result);
opcode_map = get_opcode_map(game);
opcode_map = game->_opcodeMap;
opcode = opcode_map[instr->opcode];
debugN(" [%.2x] ", instr->opcode);

13
engines/glk/comprehend/game.cpp
View File

@ -44,11 +44,11 @@ struct WinSize {
static WinSize console_winsize;
ComprehendGame::ComprehendGame() : _gameName(nullptr),
_shortName(nullptr),
_gameDataFile(nullptr),
_savegameFileFormat(nullptr),
_colorTable(0),
_gameStrings(nullptr) {
_shortName(nullptr),
_gameDataFile(nullptr),
_savegameFileFormat(nullptr),
_colorTable(0),
_gameStrings(nullptr) {
}
ComprehendGame::~ComprehendGame() {
@ -426,7 +426,7 @@ static void eval_instruction(ComprehendGame *game,
FunctionState *func_state,
Instruction *instr,
Word *verb, Word *noun) {
uint8 *opcode_map;
const byte *opcode_map = game->_opcodeMap;
Room *room;
Item *item;
uint16 index;
@ -477,7 +477,6 @@ static void eval_instruction(ComprehendGame *game,
}
}
opcode_map = get_opcode_map(game);
switch (opcode_map[instr->opcode]) {
case OPCODE_VAR_ADD:
game->_variables[instr->operand[0]] +=

3
engines/glk/comprehend/game.h
View File

@ -25,6 +25,7 @@
#include "common/array.h"
#include "glk/comprehend/game_data.h"
#include "glk/comprehend/opcode_map.h"
namespace Glk {
namespace Comprehend {
@ -33,7 +34,7 @@ namespace Comprehend {
#define ROOM_IS_DARK 1
#define ROOM_IS_TOO_BRIGHT 2
class ComprehendGame : public GameInfo {
class ComprehendGame : public GameInfo, public OpcodeMap {
public:
const char *_gameName;
const char *_shortName;

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

@ -875,6 +875,8 @@ static void parse_header(ComprehendGame *game, FileBuffer *fb) {
break;
}
game->loadOpcodes(game->_comprehendVersion);
/* FIXME - Second word in header has unknown usage */
parse_header_le16(fb, &dummy);

306
engines/glk/comprehend/opcode_map.cpp
View File

@ -1,193 +1,169 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* ScummVM is the legal property of its developers; whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* of the License; or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* This program is distributed in the hope that it will be useful;
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* along with this program; if not; write to the Free Software
* Foundation; Inc.; 51 Franklin Street; Fifth Floor; Boston; MA 02110-1301; USA.
*
*/
#include "glk/comprehend/comprehend.h"
#include "glk/comprehend/game.h"
#include "glk/comprehend/opcode_map.h"
#include "glk/comprehend/game_data.h"
#include "glk/comprehend/util.h"
#include "common/algorithm.h"
#include "common/textconsole.h"
namespace Glk {
namespace Comprehend {
/*
* Version 2 of the Comprehend engine (OO-Topos) changes some of the opcode
* numbers and adds new opcodes. Use tables to translate the opcodes used
* in the original games into a generic version used by Re-Comprehend.
*
* FIXME - unimplemented/unknown ocpodes:
*
* d5(obj): Make object visible. This will print a "you see: object" when the
* object is in the room.
*/
static uint8 opcode_map_v1[0x100] = {
#ifdef TODO
[0x01] = OPCODE_HAVE_OBJECT,
[0x04] = OPCODE_OR,
[0x05] = OPCODE_IN_ROOM,
[0x06] = OPCODE_VAR_EQ,
[0x08] = OPCODE_CURRENT_OBJECT_TAKEABLE,
[0x09] = OPCODE_OBJECT_PRESENT,
[0x0c] = OPCODE_ELSE,
[0x0e] = OPCODE_OBJECT_IN_ROOM,
[0x14] = OPCODE_OBJECT_NOT_VALID,
[0x18] = OPCODE_INVENTORY_FULL,
[0x19] = OPCODE_TEST_FLAG,
[0x1d] = OPCODE_CURRENT_OBJECT_IN_ROOM,
[0x20] = OPCODE_HAVE_CURRENT_OBJECT,
[0x21] = OPCODE_OBJECT_IS_NOT_NOWHERE,
[0x24] = OPCODE_CURRENT_OBJECT_PRESENT,
[0x31] = OPCODE_TEST_ROOM_FLAG,
[0x41] = OPCODE_NOT_HAVE_OBJECT,
[0x45] = OPCODE_NOT_IN_ROOM,
[0x48] = OPCODE_CURRENT_OBJECT_IS_NOWHERE,
[0x49] = OPCODE_OBJECT_NOT_PRESENT,
[0x43] = OPCODE_OBJECT_NOT_IN_ROOM,
[0x50] = OPCODE_TEST_FALSE,
[0x59] = OPCODE_TEST_NOT_FLAG,
[0x60] = OPCODE_NOT_HAVE_CURRENT_OBJECT,
[0x61] = OPCODE_OBJECT_IS_NOWHERE,
[0x64] = OPCODE_CURRENT_OBJECT_NOT_PRESENT,
[0x68] = OPCODE_CURRENT_OBJECT_NOT_TAKEABLE,
[0x71] = OPCODE_TEST_NOT_ROOM_FLAG,
[0x80] = OPCODE_INVENTORY,
[0x81] = OPCODE_TAKE_OBJECT,
[0x82] = OPCODE_MOVE_OBJECT_TO_ROOM,
[0x84] = OPCODE_SAVE_ACTION,
[0x85] = OPCODE_MOVE_TO_ROOM,
[0x86] = OPCODE_VAR_ADD,
[0x87] = OPCODE_SET_ROOM_DESCRIPTION,
[0x89] = OPCODE_MOVE_OBJECT_TO_CURRENT_ROOM,
[0x8a] = OPCODE_VAR_SUB,
[0x8b] = OPCODE_SET_OBJECT_DESCRIPTION,
[0x8c] = OPCODE_MOVE,
[0x8e] = OPCODE_PRINT,
[0x95] = OPCODE_REMOVE_OBJECT,
[0x99] = OPCODE_SET_FLAG,
[0x92] = OPCODE_CALL_FUNC,
[0x98] = OPCODE_TURN_TICK,
[0x9d] = OPCODE_CLEAR_FLAG,
[0x9e] = OPCODE_INVENTORY_ROOM,
[0xa0] = OPCODE_TAKE_CURRENT_OBJECT,
[0xa1] = OPCODE_SPECIAL,
[0xa4] = OPCODE_DROP_CURRENT_OBJECT,
[0xa2] = OPCODE_SET_ROOM_GRAPHIC,
[0xb0] = OPCODE_REMOVE_CURRENT_OBJECT,
[0xb1] = OPCODE_DO_VERB,
[0xb9] = OPCODE_SET_STRING_REPLACEMENT,
[0xbd] = OPCODE_VAR_INC,
[0xc1] = OPCODE_VAR_DEC,
[0xc9] = OPCODE_MOVE_CURRENT_OBJECT_TO_ROOM
#else
0
#endif
};
void OpcodeMap::loadOpcodes(int version) {
Common::fill(&_opcodeMap[0], &_opcodeMap[0x100], 0);
static uint8 opcode_map_v2[0x100] = {
#ifdef TODO
[0x01] = OPCODE_HAVE_OBJECT,
[0x04] = OPCODE_OR,
[0x05] = OPCODE_IN_ROOM,
[0x06] = OPCODE_VAR_EQ,
[0x08] = OPCODE_CURRENT_IS_OBJECT,
[0x09] = OPCODE_OBJECT_PRESENT,
[0x0c] = OPCODE_ELSE,
[0x11] = OPCODE_OBJECT_IS_NOWHERE,
[0x14] = OPCODE_OBJECT_NOT_VALID,
[0x19] = OPCODE_TEST_FLAG,
[0x1d] = OPCODE_TEST_ROOM_FLAG,
[0x20] = OPCODE_HAVE_CURRENT_OBJECT,
[0x21] = OPCODE_OBJECT_PRESENT,
[0x22] = OPCODE_OBJECT_IN_ROOM,
[0x30] = OPCODE_CURRENT_OBJECT_PRESENT,
[0x31] = OPCODE_TEST_ROOM_FLAG,
[0x38] = OPCODE_INVENTORY_FULL,
[0x41] = OPCODE_NOT_HAVE_OBJECT,
[0x45] = OPCODE_NOT_IN_ROOM,
[0x48] = OPCODE_CURRENT_OBJECT_IS_NOWHERE,
[0x43] = OPCODE_OBJECT_NOT_IN_ROOM,
[0x59] = OPCODE_TEST_NOT_FLAG,
[0x5d] = OPCODE_TEST_NOT_ROOM_FLAG,
[0x60] = OPCODE_NOT_HAVE_CURRENT_OBJECT,
[0x61] = OPCODE_OBJECT_NOT_PRESENT,
[0x70] = OPCODE_CURRENT_OBJECT_NOT_PRESENT,
[0x74] = OPCODE_CURRENT_NOT_OBJECT,
[0x80] = OPCODE_INVENTORY,
[0x81] = OPCODE_TAKE_OBJECT,
[0x82] = OPCODE_MOVE_OBJECT_TO_ROOM,
[0x84] = OPCODE_SAVE_ACTION,
[0x85] = OPCODE_MOVE_TO_ROOM,
[0x86] = OPCODE_VAR_ADD,
[0x87] = OPCODE_SET_ROOM_DESCRIPTION,
[0x89] = OPCODE_SPECIAL,
[0x8a] = OPCODE_VAR_SUB,
[0x8b] = OPCODE_SET_OBJECT_DESCRIPTION,
[0x8c] = OPCODE_MOVE,
[0x8e] = OPCODE_PRINT,
[0x8f] = OPCODE_SET_OBJECT_LONG_DESCRIPTION,
[0x90] = OPCODE_WAIT_KEY,
[0x92] = OPCODE_CALL_FUNC,
[0x95] = OPCODE_REMOVE_OBJECT,
[0x98] = OPCODE_TURN_TICK,
[0x99] = OPCODE_SET_FLAG,
[0x9d] = OPCODE_CLEAR_FLAG,
[0x9e] = OPCODE_INVENTORY_ROOM,
[0xa0] = OPCODE_TAKE_CURRENT_OBJECT,
[0xa2] = OPCODE_SET_OBJECT_GRAPHIC,
[0xb1] = OPCODE_DO_VERB,
[0xb5] = OPCODE_DESCRIBE_CURRENT_OBJECT,
[0xc1] = OPCODE_VAR_DEC,
[0xc2] = OPCODE_SET_ROOM_GRAPHIC,
[0xc5] = OPCODE_SET_CURRENT_NOUN_STRING_REPLACEMENT,
[0xc6] = OPCODE_SET_OBJECT_GRAPHIC,
[0xc9] = OPCODE_MOVE_CURRENT_OBJECT_TO_ROOM,
[0xcd] = OPCODE_SET_STRING_REPLACEMENT,
[0xd1] = OPCODE_MOVE_DIRECTION,
[0xd5] = OPCODE_DRAW_ROOM,
[0xd9] = OPCODE_DRAW_OBJECT,
[0xdd] = OPCODE_VAR_INC,
[0xe1] = OPCODE_MOVE_OBJECT_TO_CURRENT_ROOM,
[0xed] = OPCODE_REMOVE_OBJECT,
[0xf0] = OPCODE_DROP_CURRENT_OBJECT,
[0xfc] = OPCODE_REMOVE_CURRENT_OBJECT
#else
0
#endif
};
if (version == 1)
loadVersion1();
else if (version == 2)
loadVersion2();
else
error("Invalid version");
}
uint8 *get_opcode_map(ComprehendGame *game)
{
switch (game->_comprehendVersion) {
case 1:
return opcode_map_v1;
break;
case 2:
return opcode_map_v2;
default:
fatal_error("Unsupported Comprehend version %d\n",
game->_comprehendVersion);
void OpcodeMap::loadVersion1() {
_opcodeMap[0x01] = OPCODE_HAVE_OBJECT;
_opcodeMap[0x04] = OPCODE_OR;
_opcodeMap[0x05] = OPCODE_IN_ROOM;
_opcodeMap[0x06] = OPCODE_VAR_EQ;
_opcodeMap[0x08] = OPCODE_CURRENT_OBJECT_TAKEABLE;
_opcodeMap[0x09] = OPCODE_OBJECT_PRESENT;
_opcodeMap[0x0c] = OPCODE_ELSE;
_opcodeMap[0x0e] = OPCODE_OBJECT_IN_ROOM;
_opcodeMap[0x14] = OPCODE_OBJECT_NOT_VALID;
_opcodeMap[0x18] = OPCODE_INVENTORY_FULL;
_opcodeMap[0x19] = OPCODE_TEST_FLAG;
_opcodeMap[0x1d] = OPCODE_CURRENT_OBJECT_IN_ROOM;
_opcodeMap[0x20] = OPCODE_HAVE_CURRENT_OBJECT;
_opcodeMap[0x21] = OPCODE_OBJECT_IS_NOT_NOWHERE;
_opcodeMap[0x24] = OPCODE_CURRENT_OBJECT_PRESENT;
_opcodeMap[0x31] = OPCODE_TEST_ROOM_FLAG;
_opcodeMap[0x41] = OPCODE_NOT_HAVE_OBJECT;
_opcodeMap[0x45] = OPCODE_NOT_IN_ROOM;
_opcodeMap[0x48] = OPCODE_CURRENT_OBJECT_IS_NOWHERE;
_opcodeMap[0x49] = OPCODE_OBJECT_NOT_PRESENT;
_opcodeMap[0x43] = OPCODE_OBJECT_NOT_IN_ROOM;
_opcodeMap[0x50] = OPCODE_TEST_FALSE;
_opcodeMap[0x59] = OPCODE_TEST_NOT_FLAG;
_opcodeMap[0x60] = OPCODE_NOT_HAVE_CURRENT_OBJECT;
_opcodeMap[0x61] = OPCODE_OBJECT_IS_NOWHERE;
_opcodeMap[0x64] = OPCODE_CURRENT_OBJECT_NOT_PRESENT;
_opcodeMap[0x68] = OPCODE_CURRENT_OBJECT_NOT_TAKEABLE;
_opcodeMap[0x71] = OPCODE_TEST_NOT_ROOM_FLAG;
_opcodeMap[0x80] = OPCODE_INVENTORY;
_opcodeMap[0x81] = OPCODE_TAKE_OBJECT;
_opcodeMap[0x82] = OPCODE_MOVE_OBJECT_TO_ROOM;
_opcodeMap[0x84] = OPCODE_SAVE_ACTION;
_opcodeMap[0x85] = OPCODE_MOVE_TO_ROOM;
_opcodeMap[0x86] = OPCODE_VAR_ADD;
_opcodeMap[0x87] = OPCODE_SET_ROOM_DESCRIPTION;
_opcodeMap[0x89] = OPCODE_MOVE_OBJECT_TO_CURRENT_ROOM;
_opcodeMap[0x8a] = OPCODE_VAR_SUB;
_opcodeMap[0x8b] = OPCODE_SET_OBJECT_DESCRIPTION;
_opcodeMap[0x8c] = OPCODE_MOVE;
_opcodeMap[0x8e] = OPCODE_PRINT;
_opcodeMap[0x95] = OPCODE_REMOVE_OBJECT;
_opcodeMap[0x99] = OPCODE_SET_FLAG;
_opcodeMap[0x92] = OPCODE_CALL_FUNC;
_opcodeMap[0x98] = OPCODE_TURN_TICK;
_opcodeMap[0x9d] = OPCODE_CLEAR_FLAG;
_opcodeMap[0x9e] = OPCODE_INVENTORY_ROOM;
_opcodeMap[0xa0] = OPCODE_TAKE_CURRENT_OBJECT;
_opcodeMap[0xa1] = OPCODE_SPECIAL;
_opcodeMap[0xa4] = OPCODE_DROP_CURRENT_OBJECT;
_opcodeMap[0xa2] = OPCODE_SET_ROOM_GRAPHIC;
_opcodeMap[0xb0] = OPCODE_REMOVE_CURRENT_OBJECT;
_opcodeMap[0xb1] = OPCODE_DO_VERB;
_opcodeMap[0xb9] = OPCODE_SET_STRING_REPLACEMENT;
_opcodeMap[0xbd] = OPCODE_VAR_INC;
_opcodeMap[0xc1] = OPCODE_VAR_DEC;
_opcodeMap[0xc9] = OPCODE_MOVE_CURRENT_OBJECT_TO_ROOM;
}
/* Not reached */
return NULL;
}
void OpcodeMap::loadVersion2() {
_opcodeMap[0x01] = OPCODE_HAVE_OBJECT;
_opcodeMap[0x04] = OPCODE_OR;
_opcodeMap[0x05] = OPCODE_IN_ROOM;
_opcodeMap[0x06] = OPCODE_VAR_EQ;
_opcodeMap[0x08] = OPCODE_CURRENT_IS_OBJECT;
_opcodeMap[0x09] = OPCODE_OBJECT_PRESENT;
_opcodeMap[0x0c] = OPCODE_ELSE;
_opcodeMap[0x11] = OPCODE_OBJECT_IS_NOWHERE;
_opcodeMap[0x14] = OPCODE_OBJECT_NOT_VALID;
_opcodeMap[0x19] = OPCODE_TEST_FLAG;
_opcodeMap[0x1d] = OPCODE_TEST_ROOM_FLAG;
_opcodeMap[0x20] = OPCODE_HAVE_CURRENT_OBJECT;
_opcodeMap[0x21] = OPCODE_OBJECT_PRESENT;
_opcodeMap[0x22] = OPCODE_OBJECT_IN_ROOM;
_opcodeMap[0x30] = OPCODE_CURRENT_OBJECT_PRESENT;
_opcodeMap[0x31] = OPCODE_TEST_ROOM_FLAG;
_opcodeMap[0x38] = OPCODE_INVENTORY_FULL;
_opcodeMap[0x41] = OPCODE_NOT_HAVE_OBJECT;
_opcodeMap[0x45] = OPCODE_NOT_IN_ROOM;
_opcodeMap[0x48] = OPCODE_CURRENT_OBJECT_IS_NOWHERE;
_opcodeMap[0x43] = OPCODE_OBJECT_NOT_IN_ROOM;
_opcodeMap[0x59] = OPCODE_TEST_NOT_FLAG;
_opcodeMap[0x5d] = OPCODE_TEST_NOT_ROOM_FLAG;
_opcodeMap[0x60] = OPCODE_NOT_HAVE_CURRENT_OBJECT;
_opcodeMap[0x61] = OPCODE_OBJECT_NOT_PRESENT;
_opcodeMap[0x70] = OPCODE_CURRENT_OBJECT_NOT_PRESENT;
_opcodeMap[0x74] = OPCODE_CURRENT_NOT_OBJECT;
_opcodeMap[0x80] = OPCODE_INVENTORY;
_opcodeMap[0x81] = OPCODE_TAKE_OBJECT;
_opcodeMap[0x82] = OPCODE_MOVE_OBJECT_TO_ROOM;
_opcodeMap[0x84] = OPCODE_SAVE_ACTION;
_opcodeMap[0x85] = OPCODE_MOVE_TO_ROOM;
_opcodeMap[0x86] = OPCODE_VAR_ADD;
_opcodeMap[0x87] = OPCODE_SET_ROOM_DESCRIPTION;
_opcodeMap[0x89] = OPCODE_SPECIAL;
_opcodeMap[0x8a] = OPCODE_VAR_SUB;
_opcodeMap[0x8b] = OPCODE_SET_OBJECT_DESCRIPTION;
_opcodeMap[0x8c] = OPCODE_MOVE;
_opcodeMap[0x8e] = OPCODE_PRINT;
_opcodeMap[0x8f] = OPCODE_SET_OBJECT_LONG_DESCRIPTION;
_opcodeMap[0x90] = OPCODE_WAIT_KEY;
_opcodeMap[0x92] = OPCODE_CALL_FUNC;
_opcodeMap[0x95] = OPCODE_REMOVE_OBJECT;
_opcodeMap[0x98] = OPCODE_TURN_TICK;
_opcodeMap[0x99] = OPCODE_SET_FLAG;
_opcodeMap[0x9d] = OPCODE_CLEAR_FLAG;
_opcodeMap[0x9e] = OPCODE_INVENTORY_ROOM;
_opcodeMap[0xa0] = OPCODE_TAKE_CURRENT_OBJECT;
_opcodeMap[0xa2] = OPCODE_SET_OBJECT_GRAPHIC;
_opcodeMap[0xb1] = OPCODE_DO_VERB;
_opcodeMap[0xb5] = OPCODE_DESCRIBE_CURRENT_OBJECT;
_opcodeMap[0xc1] = OPCODE_VAR_DEC;
_opcodeMap[0xc2] = OPCODE_SET_ROOM_GRAPHIC;
_opcodeMap[0xc5] = OPCODE_SET_CURRENT_NOUN_STRING_REPLACEMENT;
_opcodeMap[0xc6] = OPCODE_SET_OBJECT_GRAPHIC;
_opcodeMap[0xc9] = OPCODE_MOVE_CURRENT_OBJECT_TO_ROOM;
_opcodeMap[0xcd] = OPCODE_SET_STRING_REPLACEMENT;
_opcodeMap[0xd1] = OPCODE_MOVE_DIRECTION;
_opcodeMap[0xd5] = OPCODE_DRAW_ROOM;
_opcodeMap[0xd9] = OPCODE_DRAW_OBJECT;
_opcodeMap[0xdd] = OPCODE_VAR_INC;
_opcodeMap[0xe1] = OPCODE_MOVE_OBJECT_TO_CURRENT_ROOM;
_opcodeMap[0xed] = OPCODE_REMOVE_OBJECT;
_opcodeMap[0xf0] = OPCODE_DROP_CURRENT_OBJECT;
_opcodeMap[0xfc] = OPCODE_REMOVE_CURRENT_OBJECT;
}
} // namespace Comprehend

24
engines/glk/comprehend/opcode_map.h
View File

@ -23,12 +23,32 @@
#ifndef GLK_COMPREHEND_OPCODE_MAP_H
#define GLK_COMPREHEND_OPCODE_MAP_H
#include "glk/comprehend/game.h"
#include "common/scummsys.h"
namespace Glk {
namespace Comprehend {
uint8 *get_opcode_map(ComprehendGame *game);
/*
* Version 2 of the Comprehend engine (OO-Topos) changes some of the opcode
* numbers and adds new opcodes. This class encapsulates a table to translate
* the opcodes used in the original games into a generic version used by the engine
*
* FIXME - unimplemented/unknown ocpodes:
*
* d5(obj): Make object visible. This will print a "you see: object" when the
* object is in the room.
*/
class OpcodeMap {
public:
byte _opcodeMap[0x100];
private:
void loadVersion1();
void loadVersion2();
public:
void loadOpcodes(int version);
};
} // namespace Comprehend
} // namespace Glk