aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2003-03-08 00:21:34 +0000
committerTravis Howell2003-03-08 00:21:34 +0000
commitddd54ed3c5ae798fb15333404822789613f05468 (patch)
tree5e25d7927e2c7e713cea71032355bdfca8a2fdf4
parent8073abd096d0f381929b522923137dc7d823c9d8 (diff)
downloadscummvm-rg350-ddd54ed3c5ae798fb15333404822789613f05468.tar.gz
scummvm-rg350-ddd54ed3c5ae798fb15333404822789613f05468.tar.bz2
scummvm-rg350-ddd54ed3c5ae798fb15333404822789613f05468.zip
Rename function
svn-id: r6761
-rw-r--r--simon/items.cpp8
-rw-r--r--simon/simon.cpp18
-rw-r--r--simon/simon.h4
3 files changed, 15 insertions, 15 deletions
diff --git a/simon/items.cpp b/simon/items.cpp
index 2d84ce730e..5729c07b25 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -535,11 +535,11 @@ int SimonState::runScript() {
case 99:{ /* kill thread */
if (!(_game & GF_SIMON2)) {
- o_unk_99_simon1(getVarOrWord());
+ o_kill_thread_simon1(getVarOrWord());
} else {
uint a = getVarOrWord();
uint b = getVarOrWord();
- o_unk_99_simon2(a, b);
+ o_kill_thread_simon2(a, b);
}
}
break;
@@ -1504,7 +1504,7 @@ void SimonState::o_unk_103() {
unlock();
}
-void SimonState::o_unk_99_simon1(uint a) {
+void SimonState::o_kill_thread_simon1(uint a) {
uint16 b = TO_BE_16(a);
_lock_word |= 0x4000;
_vc_ptr = (byte *)&b;
@@ -1512,7 +1512,7 @@ void SimonState::o_unk_99_simon1(uint a) {
_lock_word &= ~0x4000;
}
-void SimonState::o_unk_99_simon2(uint a, uint b) {
+void SimonState::o_kill_thread_simon2(uint a, uint b) {
uint16 items[2];
items[0] = TO_BE_16(a);
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 0846ede986..48d95c6801 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -1399,7 +1399,7 @@ void SimonState::setup_hit_areas(FillOrCopyStruct *fcs, uint fcs_index) {
ha->unk3 = 1;
/* Simon1 specific */
- o_unk_99_simon1(0x80);
+ o_kill_thread_simon1(0x80);
start_vga_code(0, 1, 0x80, 0, 0, 0xE);
} else {
ha->x = 227;
@@ -1839,7 +1839,7 @@ void SimonState::o_print_str() {
return;
if (speech_id == 0)
- o_unk_99_simon2(2, num_1 + 2);
+ o_kill_thread_simon2(2, num_1 + 2);
talk_with_text(num_1, num_2, (char *)string_ptr, tv->a, tv->b, tv->c);
break;
@@ -2554,7 +2554,7 @@ void SimonState::skip_speech() {
_variableArray[100] = 5;
start_vga_code(4, 1, 0x1e, 0, 0, 0);
o_wait_for_vga(0x82);
- o_unk_99_simon2(2, 1);
+ o_kill_thread_simon2(2, 1);
}
}
@@ -2967,7 +2967,7 @@ void SimonState::fcs_unk1(uint fcs_index) {
/* ok */
void SimonState::fcs_unk_5(FillOrCopyStruct *fcs, uint fcs_index) {
if (!(_game & GF_SIMON2)) {
- o_unk_99_simon1(0x80);
+ o_kill_thread_simon1(0x80);
}
}
@@ -3877,7 +3877,7 @@ void SimonState::talk_with_speech(uint speech_id, uint num_1) {
return;
}
if (num_1 < 100) {
- o_unk_99_simon1(num_1 + 201);
+ o_kill_thread_simon1(num_1 + 201);
}
_sound->playVoice(speech_id);
@@ -3900,9 +3900,9 @@ void SimonState::talk_with_speech(uint speech_id, uint num_1) {
if (_subtitles && _scriptvar_2) {
start_vga_code(4, 2, 5, 0, 0, 0);
o_wait_for_vga(0xcd);
- o_unk_99_simon2(2, 5);
+ o_kill_thread_simon2(2, 5);
}
- o_unk_99_simon2(2, num_1 + 2);
+ o_kill_thread_simon2(2, num_1 + 2);
_sound->playVoice(speech_id);
start_vga_code(4, 2, num_1 + 2, 0, 0, 0);
@@ -4151,9 +4151,9 @@ void SimonState::talk_with_text(uint num_1, uint num_2, const char *string_ptr,
strcpy(char_buf, string_ptr_2);
if (!(_game & GF_SIMON2)) {
- o_unk_99_simon1(199 + num_1);
+ o_kill_thread_simon1(199 + num_1);
} else {
- o_unk_99_simon2(2, num_1);
+ o_kill_thread_simon2(2, num_1);
}
num_2 = num_2 * 3 + 192;
diff --git a/simon/simon.h b/simon/simon.h
index e7c7e6a9f0..e5c10c8d9e 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -436,8 +436,8 @@ public:
bool o_unk_23(uint a);
- void o_unk_99_simon1(uint a);
- void o_unk_99_simon2(uint a, uint b);
+ void o_kill_thread_simon1(uint a);
+ void o_kill_thread_simon2(uint a, uint b);
void o_vga_reset();
void o_unk_101();