More renames

svn-id: r7884

5 files changed, 43 insertions, 43 deletions

diff --git a/simon/debug.h b/simon/debug.h
index 0e3c6ee3a3..ff3eed9f5a 100644
--- a/simon/debug.h
+++ b/simon/debug.h
@@ -142,7 +142,7 @@ static const char *const simon1dos_opcode_name_table[256] = {
 	"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 @@ static const char *const simon1talkie_opcode_name_table[256] = {
 	"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 @@ static const char *const simon2dos_opcode_name_table[256] = {
 	"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 @@ static const char *const simon2talkie_opcode_name_table[256] = {
 	"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 @@ const char *const simon1_video_opcode_name_table[] = {
 	"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 @@ const char *const simon1_video_opcode_name_table[] = {
 	/* 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 @@ const char *const simon1_video_opcode_name_table[] = {
 	"|UNK_58",
 	"|SKIP_IF_TEXT",
 	/* 60 */
-	"d|KILL_THREAD",
+	"d|KILL_SPRITE",
 	"ddd|INIT_SPRITE",
 	"|PALETTE_THING",
 	"|PALETTE_THING_2",
@@ -1065,7 +1065,7 @@ const char *const simon2_video_opcode_name_table[] = {
 	"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 @@ const char *const simon2_video_opcode_name_table[] = {
 	/* 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 @@ const char *const simon2_video_opcode_name_table[] = {
 	"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",
diff --git a/simon/items.cpp b/simon/items.cpp
index 760db17dc3..8916e49e0c 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -533,13 +533,13 @@ int SimonState::runScript() {
 			}
 			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 @@ void SimonState::o_unk_103() {
 	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 @@ void SimonState::o_kill_thread_simon1(uint a) {
 	_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);
diff --git a/simon/simon.cpp b/simon/simon.cpp
index ca147afae7..db14f6aa69 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -1626,7 +1626,7 @@ void SimonState::setup_hit_areas(FillOrCopyStruct *fcs, uint fcs_index) {
 		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 @@ void SimonState::o_print_str() {
 			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 @@ void SimonState::expire_vga_timers() {
 					// 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 @@ void SimonState::expire_vga_timers() {
 				_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 @@ void SimonState::scroll_timeout() {
 	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 @@ void SimonState::skip_speech() {
 		_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 @@ void SimonState::fcs_unk1(uint fcs_index) {
 // 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 @@ void SimonState::talk_with_speech(uint speech_id, uint num_1) {
 			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 @@ 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_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 @@ 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_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;
 
diff --git a/simon/simon.h b/simon/simon.h
index 2a1dcf6768..c3a9041e2e 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -443,8 +443,8 @@ public:
 
 	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 @@ public:
 	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 @@ public:
 	void realizePalette();
 	void fadeUpPalette();
 
-	void vc_kill_thread(uint file, uint sprite);
+	void vc_kill_sprite(uint file, uint sprite);
 
 	void set_dummy_cursor();
 
diff --git a/simon/vga.cpp b/simon/vga.cpp
index 1bb43e62f9..7108c2a82b 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -1577,7 +1577,7 @@ void SimonState::vc_59() {
 		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 @@ void SimonState::vc_57_no_op() {
 	/* 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 @@ void SimonState::vc_60_kill_sprite() {
 		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() {