From 2986adb53dea09928f5051674e4d53d39d83cf27 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Sun, 8 Dec 2002 15:39:57 +0000 Subject: Correct error in last commit svn-id: r5884 --- simon/debug.h | 4 ++-- simon/simon.h | 2 +- simon/vga.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/simon/debug.h b/simon/debug.h index 9e2eac974a..c104b83da8 100644 --- a/simon/debug.h +++ b/simon/debug.h @@ -1052,7 +1052,7 @@ const char *const simon1_video_opcode_name_table[] = { "|DUMMY57", "|UNK58", "|DUMMY_9", - "|SKIP_IF_SPEECH", + "|SKIP_IF_TEXT", /* 60 */ "d|KILL_THREAD", "ddd|INIT_SPRITE", @@ -1143,7 +1143,7 @@ const char *const simon2_video_opcode_name_table[] = { "|PALETTE_THING", "|PALETTE_THING_2", /* 64 */ - "|SKIP_IF_SPEECH", + "|SKIP_IF_TEXT", "|PALETTE_THING_3", "|SKIP_IF_NZ", "|SKIP_IF_GE", diff --git a/simon/simon.h b/simon/simon.h index b9cc8003d4..a280f8b0f3 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -653,7 +653,7 @@ public: void vc_63_palette_thing_2(); // Simon2 specific Video Script Opcodes - void vc_64_skip_if_speech(); + void vc_64_skip_if_text(); void vc_65_palette_thing_3(); void vc_66_skip_if_nz(); void vc_67_skip_if_ge(); diff --git a/simon/vga.cpp b/simon/vga.cpp index a940256246..bd8bd556f8 100644 --- a/simon/vga.cpp +++ b/simon/vga.cpp @@ -94,7 +94,7 @@ static const VgaOpcodeProc vga_opcode_table[] = { &SimonState::vc_61_sprite_change, &SimonState::vc_62_palette_thing, &SimonState::vc_63_palette_thing_2, - &SimonState::vc_64_skip_if_speech, + &SimonState::vc_64_skip_if_text, &SimonState::vc_65_palette_thing_3, &SimonState::vc_66_skip_if_nz, &SimonState::vc_67_skip_if_ge, @@ -1851,7 +1851,7 @@ void SimonState::vc_63_palette_thing_2() _video_var_3 = false; } -void SimonState::vc_64_skip_if_speech() +void SimonState::vc_64_skip_if_text() { // Simon2 if (vc_59_helper()) vc_skip_next_instruction(); -- cgit v1.2.3