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

A few video opcode renames

Browse source 
svn-id: r5883
This commit is contained in:
Travis Howell 2002-12-08 14:48:56 +00:00
parent 7e2391fce2
commit 3472a5c1e7
3 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

48
simon/debug.h
View file

@ -980,11 +980,11 @@ static const char *const simon2talkie_opcode_name_table[256] = {
const char *const simon1_video_opcode_name_table[] = { const char *const simon1_video_opcode_name_table[] = {
/* 0 */ /* 0 */
"x|RET", "x|RET",
"ddd|DUMMY", "ddd|DUMMY1",
"d|CALL", "d|CALL",
"ddddd|NEW_THREAD", "ddddd|NEW_THREAD",
/* 4 */ /* 4 */
"ddd|DUMMY_2", "ddd|DUMMY4",
"vd|SKIP_IF_NEQ", "vd|SKIP_IF_NEQ",
"d|SKIP_IFN_SIB_WITH_A", "d|SKIP_IFN_SIB_WITH_A",
"d|SKIP_IF_SIB_WITH_A", "d|SKIP_IF_SIB_WITH_A",
@ -1022,7 +1022,7 @@ const char *const simon1_video_opcode_name_table[] = {
"vv|COPY_VAR", "vv|COPY_VAR",
"|FORCE_UNLOCK", "|FORCE_UNLOCK",
"|FORCE_LOCK", "|FORCE_LOCK",
"dd|DUMMY_4", "dd|VC35",
/* 36 */ /* 36 */
"dd|SAVELOAD_THING", "dd|SAVELOAD_THING",
"v|OFFSET_Y_F", "v|OFFSET_Y_F",
@ -1044,15 +1044,15 @@ const char *const simon1_video_opcode_name_table[] = {
"d|CLEAR_BIT", "d|CLEAR_BIT",
"d|CLEAR_HITAREA_BIT_0x40", "d|CLEAR_HITAREA_BIT_0x40",
/* 52 */ /* 52 */
"d|VC_52", "d|PLAY_SOUND",
"dd|DUMMY_5", "dd|DUMMY53",
"ddd|DUMMY_6", "ddd|DUMMY54",
"ddd|OFFSET_HIT_AREA", "ddd|OFFSET_HIT_AREA",
/* 56 */ /* 56 */
"|DUMMY_7", "|DUMMY57",
"|DUMMY_8", "|UNK58",
"|DUMMY_9", "|DUMMY_9",
"|SKIP_IF_SOUND??", "|SKIP_IF_SPEECH",
/* 60 */ /* 60 */
"d|KILL_THREAD", "d|KILL_THREAD",
"ddd|INIT_SPRITE", "ddd|INIT_SPRITE",
@ -1064,11 +1064,11 @@ const char *const simon1_video_opcode_name_table[] = {
const char *const simon2_video_opcode_name_table[] = { const char *const simon2_video_opcode_name_table[] = {
/* 0 */ /* 0 */
"x|RET", "x|RET",
"ddd|DUMMY", "ddd|DUMMY1",
"d|CALL", "d|CALL",
"ddddd|NEW_THREAD", "ddddd|NEW_THREAD",
/* 4 */ /* 4 */
"ddd|DUMMY_2", "ddd|DUMMY4",
"vd|SKIP_IF_NEQ", "vd|SKIP_IF_NEQ",
"d|SKIP_IFN_SIB_WITH_A", "d|SKIP_IFN_SIB_WITH_A",
"d|SKIP_IF_SIB_WITH_A", "d|SKIP_IF_SIB_WITH_A",
@ -1106,7 +1106,7 @@ const char *const simon2_video_opcode_name_table[] = {
"vv|COPY_VAR", "vv|COPY_VAR",
"|FORCE_UNLOCK", "|FORCE_UNLOCK",
"|FORCE_LOCK", "|FORCE_LOCK",
"dd|DUMMY_4", "dd|VC35",
/* 36 */ /* 36 */
"dd|SAVELOAD_THING", "dd|SAVELOAD_THING",
"v|OFFSET_Y_F", "v|OFFSET_Y_F",
@ -1128,14 +1128,14 @@ const char *const simon2_video_opcode_name_table[] = {
"d|CLEAR_BIT", "d|CLEAR_BIT",
"d|CLEAR_HITAREA_BIT_0x40", "d|CLEAR_HITAREA_BIT_0x40",
/* 52 */ /* 52 */
"d|VC_52", "d|PLAY_SOUND",
"dd|DUMMY_5", "dd|DUMMY53",
"ddd|DUMMY_6", "ddd|DUMMY54",
"ddd|OFFSET_HIT_AREA", "ddd|OFFSET_HIT_AREA",
/* 56 */ /* 56 */
"i|SLEEP_EX", "i|SLEEP_EX",
"|DUMMY_8", "|DUMMY_57",
"|DUMMY_9", "|UNK58",
"ddd|KILL_MULTI_THREAD", "ddd|KILL_MULTI_THREAD",
/* 60 */ /* 60 */
"dd|KILL_THREAD", "dd|KILL_THREAD",
@ -1143,18 +1143,18 @@ const char *const simon2_video_opcode_name_table[] = {
"|PALETTE_THING", "|PALETTE_THING",
"|PALETTE_THING_2", "|PALETTE_THING_2",
/* 64 */ /* 64 */
"|UNK64", "|SKIP_IF_SPEECH",
"|UNK65", "|PALETTE_THING_3",
"|UNK66", "|SKIP_IF_NZ",
"|UNK67", "|SKIP_IF_GE",
/* 68 */ /* 68 */
"|UNK68", "|SKIP_IF_LE",
"dd|UNK69", "dd|UNK69",
"dd|UNK70", "dd|UNK70",
"|UNK71", "|UNK71",
/* 72 */ /* 72 */
"dd|UNK72", "dd|UNK72",
"bb|UNK73", "bb|SET_OP189_FLAG",
"bb|UNK74", "bb|CLEAR_OP189_FLAG",
}; };

12
simon/simon.h
View file

@ -640,7 +640,7 @@ public:
void vc_49_set_bit(); void vc_49_set_bit();
void vc_50_clear_bit(); void vc_50_clear_bit();
void vc_51_clear_hitarea_bit_0x40(); void vc_51_clear_hitarea_bit_0x40();
void vc_52(); void vc_52_play_sound();
void vc_53_no_op(); void vc_53_no_op();
void vc_54_no_op(); void vc_54_no_op();
void vc_55_offset_hit_area(); void vc_55_offset_hit_area();
@ -653,11 +653,11 @@ public:
void vc_63_palette_thing_2(); void vc_63_palette_thing_2();
// Simon2 specific Video Script Opcodes // Simon2 specific Video Script Opcodes
void vc_64(); void vc_64_skip_if_speech();
void vc_65(); void vc_65_palette_thing_3();
void vc_66_nz(); void vc_66_skip_if_nz();
void vc_67_ge(); void vc_67_skip_if_ge();
void vc_68_le(); void vc_68_skip_if_le();
void vc_69(); void vc_69();
void vc_70(); void vc_70();
void vc_71(); void vc_71();

24
simon/vga.cpp
View file

@ -82,7 +82,7 @@ static const VgaOpcodeProc vga_opcode_table[] = {
&SimonState::vc_49_set_bit, &SimonState::vc_49_set_bit,
&SimonState::vc_50_clear_bit, &SimonState::vc_50_clear_bit,
&SimonState::vc_51_clear_hitarea_bit_0x40, &SimonState::vc_51_clear_hitarea_bit_0x40,
&SimonState::vc_52, &SimonState::vc_52_play_sound,
&SimonState::vc_53_no_op, &SimonState::vc_53_no_op,
&SimonState::vc_54_no_op, &SimonState::vc_54_no_op,
&SimonState::vc_55_offset_hit_area, &SimonState::vc_55_offset_hit_area,
@ -94,11 +94,11 @@ static const VgaOpcodeProc vga_opcode_table[] = {
&SimonState::vc_61_sprite_change, &SimonState::vc_61_sprite_change,
&SimonState::vc_62_palette_thing, &SimonState::vc_62_palette_thing,
&SimonState::vc_63_palette_thing_2, &SimonState::vc_63_palette_thing_2,
&SimonState::vc_64, &SimonState::vc_64_skip_if_speech,
&SimonState::vc_65, &SimonState::vc_65_palette_thing_3,
&SimonState::vc_66_nz, &SimonState::vc_66_skip_if_nz,
&SimonState::vc_67_ge, &SimonState::vc_67_skip_if_ge,
&SimonState::vc_68_le, &SimonState::vc_68_skip_if_le,
&SimonState::vc_69, &SimonState::vc_69,
&SimonState::vc_70, &SimonState::vc_70,
&SimonState::vc_71, &SimonState::vc_71,
@ -1596,7 +1596,7 @@ void SimonState::vc_51_clear_hitarea_bit_0x40()
clear_hitarea_bit_0x40(vc_read_next_word()); clear_hitarea_bit_0x40(vc_read_next_word());
} }
void SimonState::vc_52() void SimonState::vc_52_play_sound()
{ {
uint16 a = vc_read_next_word(); uint16 a = vc_read_next_word();
@ -1851,13 +1851,13 @@ void SimonState::vc_63_palette_thing_2()
_video_var_3 = false; _video_var_3 = false;
} }
void SimonState::vc_64() void SimonState::vc_64_skip_if_speech()
{ // Simon2 { // Simon2
if (vc_59_helper()) if (vc_59_helper())
vc_skip_next_instruction(); vc_skip_next_instruction();
} }
void SimonState::vc_65() void SimonState::vc_65_palette_thing_3()
{ // Simon2 { // Simon2
_palette_color_count = 0x270; _palette_color_count = 0x270;
_video_num_pal_colors = 0x0D0; _video_num_pal_colors = 0x0D0;
@ -1869,7 +1869,7 @@ void SimonState::vc_65()
_video_var_3 = false; _video_var_3 = false;
} }
void SimonState::vc_66_nz() void SimonState::vc_66_skip_if_nz()
{ // Simon2 { // Simon2
uint a = vc_read_next_word(); uint a = vc_read_next_word();
uint b = vc_read_next_word(); uint b = vc_read_next_word();
@ -1878,7 +1878,7 @@ void SimonState::vc_66_nz()
vc_skip_next_instruction(); vc_skip_next_instruction();
} }
void SimonState::vc_67_ge() void SimonState::vc_67_skip_if_ge()
{ // Simon2 { // Simon2
uint a = vc_read_next_word(); uint a = vc_read_next_word();
uint b = vc_read_next_word(); uint b = vc_read_next_word();
@ -1887,7 +1887,7 @@ void SimonState::vc_67_ge()
vc_skip_next_instruction(); vc_skip_next_instruction();
} }
void SimonState::vc_68_le() void SimonState::vc_68_skip_if_le()
{ // Simon2 { // Simon2
uint a = vc_read_next_word(); uint a = vc_read_next_word();
uint b = vc_read_next_word(); uint b = vc_read_next_word();