[Scummvm-cvs-logs] CVS: scummvm/simon debug.h,1.9,1.10 items.cpp,1.73,1.74 simon.cpp,1.212,1.213 simon.h,1.67,1.68 vga.cpp,1.55,1.56
Travis Howell
kirben at users.sourceforge.net
Sat May 24 05:27:04 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv8540/simon
Modified Files:
debug.h items.cpp simon.cpp simon.h vga.cpp
Log Message:
More renames
Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- debug.h 22 May 2003 10:21:05 -0000 1.9
+++ debug.h 24 May 2003 12:26:27 -0000 1.10
@@ -142,7 +142,7 @@
"WB|UNK_96",
"W|LOAD_VGA",
"WBWWW|START_VGA",
- "W|KILL_THREAD",
+ "W|KILL_SPRITE",
/* 100 */
"|VGA_RESET",
"BWWWWWW|UNK_101",
@@ -380,7 +380,7 @@
"WB|UNK_96",
"W|LOAD_VGA",
"WBWWW|START_VGA",
- "W|KILL_THREAD",
+ "W|KILL_SPRITE",
/* 100 */
"|VGA_RESET",
"BWWWWWW|UNK_101",
@@ -618,7 +618,7 @@
"WB|UNK_96",
"W|LOAD_VGA",
"WWBWWW|START_VGA",
- "WW|KILL_THREAD",
+ "WW|KILL_SPRITE",
/* 100 */
"|VGA_RESET",
"BWWWWWW|UNK_101",
@@ -860,7 +860,7 @@
"WB|UNK_96",
"W|LOAD_VGA",
"WWBWWW|START_VGA",
- "WW|KILL_THREAD",
+ "WW|KILL_SPRITE",
/* 100 */
"|VGA_RESET",
"BWWWWWW|UNK_101",
@@ -982,7 +982,7 @@
"x|RET",
"ddd|DUMMY_1",
"d|CALL",
- "ddddd|NEW_THREAD",
+ "ddddd|NEW_SPRITE",
/* 4 */
"ddd|DUMMY_4",
"vd|SKIP_IF_NEQ",
@@ -1006,18 +1006,18 @@
/* 20 */
"dd|SET_CODE_WORD",
"i|JUMP_IF_CODE_WORD",
- "dd|SET_PAL",
- "d|SET_PRI",
+ "dd|SET_PALETTE",
+ "d|SET_PRIORITY",
/* 24 */
- "diid|SET_IMG_XY",
- "x|HALT_THREAD",
+ "diid|SET_SPRITE_XY",
+ "x|HALT_SPRITE",
"ddddd|SET_WINDOW",
"|RESET",
/* 28 */
"dddd|DUMMY_28",
"|STOP_ALL_SOUNDS",
"d|SET_BASE_DELAY",
- "d|SET_PALETTE_MODE",
+ "d|SET_PALETTEETTE_MODE",
/* 32 */
"vv|COPY_VAR",
"|FORCE_UNLOCK",
@@ -1054,7 +1054,7 @@
"|UNK_58",
"|SKIP_IF_TEXT",
/* 60 */
- "d|KILL_THREAD",
+ "d|KILL_SPRITE",
"ddd|INIT_SPRITE",
"|PALETTE_THING",
"|PALETTE_THING_2",
@@ -1065,7 +1065,7 @@
"x|RET",
"ddd|DUMMY_1",
"d|CALL",
- "ddddd|NEW_THREAD",
+ "ddddd|NEW_SPRITE",
/* 4 */
"ddd|DUMMY_4",
"vd|SKIP_IF_NEQ",
@@ -1089,18 +1089,18 @@
/* 20 */
"dd|SET_CODE_WORD",
"i|JUMP_IF_CODE_WORD",
- "dd|SET_PAL",
- "d|SET_PRI",
+ "dd|SET_PALETTE",
+ "d|SET_PRIORITY",
/* 24 */
- "diid|SET_IMG_XY",
- "x|HALT_THREAD",
+ "diid|SET_SPRITE_XY",
+ "x|HALT_SPRITE",
"ddddd|SET_WINDOW",
"|RESET",
/* 28 */
"dddd|DUMMY_28",
"|STOP_ALL_SOUNDS",
"d|SET_BASE_DELAY",
- "d|SET_PALETTE_MODE",
+ "d|SET_PALETTEETTE_MODE",
/* 32 */
"vv|COPY_VAR",
"|FORCE_UNLOCK",
@@ -1135,9 +1135,9 @@
"i|SLEEP_EX",
"|DUMMY_57",
"|UNK_58",
- "ddd|KILL_MULTI_THREAD",
+ "ddd|KILL_MULTI_SPRITE",
/* 60 */
- "dd|KILL_THREAD",
+ "dd|KILL_SPRITE",
"ddd|INIT_SPRITE",
"|PALETTE_THING",
"|PALETTE_THING_2",
Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- items.cpp 24 May 2003 12:13:23 -0000 1.73
+++ items.cpp 24 May 2003 12:26:27 -0000 1.74
@@ -533,13 +533,13 @@
}
break;
- case 99:{ /* kill thread */
+ case 99:{ /* kill sprite */
if (!(_game & GF_SIMON2)) {
- o_kill_thread_simon1(getVarOrWord());
+ o_kill_sprite_simon1(getVarOrWord());
} else {
uint a = getVarOrWord();
uint b = getVarOrWord();
- o_kill_thread_simon2(a, b);
+ o_kill_sprite_simon2(a, b);
}
}
break;
@@ -1491,7 +1491,7 @@
unlock();
}
-void SimonState::o_kill_thread_simon1(uint a) {
+void SimonState::o_kill_sprite_simon1(uint a) {
uint16 b = TO_BE_16(a);
_lock_word |= 0x4000;
_vc_ptr = (byte *)&b;
@@ -1499,7 +1499,7 @@
_lock_word &= ~0x4000;
}
-void SimonState::o_kill_thread_simon2(uint a, uint b) {
+void SimonState::o_kill_sprite_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.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- simon.cpp 24 May 2003 10:01:24 -0000 1.212
+++ simon.cpp 24 May 2003 12:26:27 -0000 1.213
@@ -1626,7 +1626,7 @@
ha->unk3 = 1;
// Simon1 specific
- o_kill_thread_simon1(0x80);
+ o_kill_sprite_simon1(0x80);
start_vga_code(0, 1, 0x80, 0, 0, 0xE);
} else {
ha->x = 227;
@@ -2066,7 +2066,7 @@
return;
if (speech_id == 0)
- o_kill_thread_simon2(2, num_1 + 2);
+ o_kill_sprite_simon2(2, num_1 + 2);
talk_with_text(num_1, num_2, (const char *)string_ptr, tv->a, tv->b, tv->c);
break;
@@ -2389,7 +2389,7 @@
// special scroll timer
scroll_timeout();
} else {
- vc_resume_thread(script_ptr, cur_file, cur_unk);
+ vc_resume_sprite(script_ptr, cur_file, cur_unk);
}
vte = _next_vga_timer_to_process;
} else {
@@ -2410,7 +2410,7 @@
_next_vga_timer_to_process = vte + 1;
delete_vga_timer(vte);
- vc_resume_thread(script_ptr, cur_file, cur_unk);
+ vc_resume_sprite(script_ptr, cur_file, cur_unk);
vte = _next_vga_timer_to_process;
} else {
vte++;
@@ -2441,7 +2441,7 @@
add_vga_timer(10, NULL, 0, 0);
}
-void SimonState::vc_resume_thread(byte *code_ptr, uint16 cur_file, uint16 cur_sprite) {
+void SimonState::vc_resume_sprite(byte *code_ptr, uint16 cur_file, uint16 cur_sprite) {
VgaPointersEntry *vpe;
_vga_cur_sprite_id = cur_sprite;
@@ -2772,7 +2772,7 @@
_variableArray[100] = 5;
start_vga_code(4, 1, 0x1e, 0, 0, 0);
o_wait_for_vga(0x82);
- o_kill_thread_simon2(2, 1);
+ o_kill_sprite_simon2(2, 1);
}
}
@@ -3185,7 +3185,7 @@
// ok
void SimonState::fcs_unk_5(FillOrCopyStruct *fcs, uint fcs_index) {
if (!(_game & GF_SIMON2)) {
- o_kill_thread_simon1(0x80);
+ o_kill_sprite_simon1(0x80);
}
}
@@ -4189,7 +4189,7 @@
return;
}
if (num_1 < 100) {
- o_kill_thread_simon1(num_1 + 201);
+ o_kill_sprite_simon1(num_1 + 201);
}
_sound->playVoice(speech_id);
@@ -4212,9 +4212,9 @@
if (_subtitles && _scriptvar_2) {
start_vga_code(4, 2, 5, 0, 0, 0);
o_wait_for_vga(0xcd);
- o_kill_thread_simon2(2, 5);
+ o_kill_sprite_simon2(2, 5);
}
- o_kill_thread_simon2(2, num_1 + 2);
+ o_kill_sprite_simon2(2, num_1 + 2);
_sound->playVoice(speech_id);
start_vga_code(4, 2, num_1 + 2, 0, 0, 0);
@@ -4463,9 +4463,9 @@
strcpy(char_buf, string_ptr_2);
if (!(_game & GF_SIMON2)) {
- o_kill_thread_simon1(199 + num_1);
+ o_kill_sprite_simon1(199 + num_1);
} else {
- o_kill_thread_simon2(2, num_1);
+ o_kill_sprite_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.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- simon.h 24 May 2003 12:13:23 -0000 1.67
+++ simon.h 24 May 2003 12:26:28 -0000 1.68
@@ -443,8 +443,8 @@
bool o_unk_23(uint a);
- void o_kill_thread_simon1(uint a);
- void o_kill_thread_simon2(uint a, uint b);
+ void o_kill_sprite_simon1(uint a);
+ void o_kill_sprite_simon2(uint a, uint b);
void o_vga_reset();
void o_unk_101();
@@ -679,7 +679,7 @@
void vc_74_clear_op189_flag();
void delete_vga_timer(VgaTimerEntry * vte);
- void vc_resume_thread(byte *code_ptr, uint16 cur_file, uint16 cur_sprite);
+ void vc_resume_sprite(byte *code_ptr, uint16 cur_file, uint16 cur_sprite);
int vc_read_var_or_word();
uint vc_read_next_word();
uint vc_read_next_byte();
@@ -783,7 +783,7 @@
void realizePalette();
void fadeUpPalette();
- void vc_kill_thread(uint file, uint sprite);
+ void vc_kill_sprite(uint file, uint sprite);
void set_dummy_cursor();
Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- vga.cpp 24 May 2003 12:13:23 -0000 1.55
+++ vga.cpp 24 May 2003 12:26:28 -0000 1.56
@@ -1577,7 +1577,7 @@
uint end = vc_read_next_word() + 1;
do {
- vc_kill_thread(file, start);
+ vc_kill_sprite(file, start);
} while (++start != end);
} else {
if (_sound->_voice_handle == 0)
@@ -1609,7 +1609,7 @@
/* no op */
}
-void SimonState::vc_kill_thread(uint file, uint sprite) {
+void SimonState::vc_kill_sprite(uint file, uint sprite) {
uint16 old_sprite_id, old_cur_file_id;
VgaSleepStruct *vfs;
VgaSprite *vsp;
@@ -1667,7 +1667,7 @@
file = _vga_cur_file_id;
}
uint sprite = vc_read_next_word();
- vc_kill_thread(file, sprite);
+ vc_kill_sprite(file, sprite);
}
void SimonState::vc_61_sprite_change() {
More information about the Scummvm-git-logs
mailing list