[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.54,1.55 simon.cpp,1.165,1.166 simon.h,1.55,1.56
Travis Howell
kirben at users.sourceforge.net
Fri Mar 7 16:22:03 CET 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv1983/simon
Modified Files:
items.cpp simon.cpp simon.h
Log Message:
Rename function
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- items.cpp 7 Mar 2003 12:29:21 -0000 1.54
+++ items.cpp 8 Mar 2003 00:21:34 -0000 1.55
@@ -535,11 +535,11 @@
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 @@
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 @@
_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);
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- simon.cpp 7 Mar 2003 15:38:01 -0000 1.165
+++ simon.cpp 8 Mar 2003 00:21:34 -0000 1.166
@@ -1399,7 +1399,7 @@
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 @@
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 @@
_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 @@
/* 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 @@
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 @@
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 @@
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;
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- simon.h 7 Mar 2003 15:38:09 -0000 1.55
+++ simon.h 8 Mar 2003 00:21:34 -0000 1.56
@@ -436,8 +436,8 @@
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();
More information about the Scummvm-git-logs
mailing list