A few function renames

svn-id: r7883

3 files changed, 22 insertions, 22 deletions

diff --git a/simon/items.cpp b/simon/items.cpp
index f49196222e..760db17dc3 100644
--- a/simon/items.cpp
+++ b/simon/items.cpp
@@ -1495,7 +1495,7 @@ void SimonState::o_kill_thread_simon1(uint a) {
 	uint16 b = TO_BE_16(a);
 	_lock_word |= 0x4000;
 	_vc_ptr = (byte *)&b;
-	vc_60_kill_thread();
+	vc_60_kill_sprite();
 	_lock_word &= ~0x4000;
 }
 
@@ -1507,7 +1507,7 @@ void SimonState::o_kill_thread_simon2(uint a, uint b) {
 
 	_lock_word |= 0x8000;
 	_vc_ptr = (byte *)&items;
-	vc_60_kill_thread();
+	vc_60_kill_sprite();
 	_lock_word &= ~0x8000;
 }
 
diff --git a/simon/simon.h b/simon/simon.h
index 063cfe1d37..2a1dcf6768 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -602,7 +602,7 @@ public:
 	// Simon1/Simon2 video script opcodes
 	void vc_1_dummy_op();
 	void vc_2_call();
-	void vc_3_new_thread();
+	void vc_3_new_sprite();
 	void vc_4_dummy_op();
 	void vc_5_skip_if_neq();
 	void vc_6_skip_ifn_sib_with_a();
@@ -621,10 +621,10 @@ public:
 	void vc_19_chain_to_script();
 	void vc_20_set_code_word();
 	void vc_21_jump_if_code_word();
-	void vc_22_set_pal();
-	void vc_23_set_pri();
-	void vc_24_set_image_xy();
-	void vc_25_halt_thread();
+	void vc_22_set_palette();
+	void vc_23_set_priority();
+	void vc_24_set_sprite_xy();
+	void vc_25_halt_sprite();
 	void vc_26_set_window();
 	void vc_27_reset();
 	void vc_27_reset_simon1();
@@ -660,7 +660,7 @@ public:
 	void vc_56_no_op();
 	void vc_57_no_op();
 	void vc_59();
-	void vc_60_kill_thread();
+	void vc_60_kill_sprite();
 	void vc_61_sprite_change();
 	void vc_62_palette_thing();
 	void vc_63_palette_thing_2();
diff --git a/simon/vga.cpp b/simon/vga.cpp
index 3fc4bb7758..1bb43e62f9 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -33,7 +33,7 @@ static const VgaOpcodeProc vga_opcode_table[] = {
 	NULL,
 	&SimonState::vc_1_dummy_op,
 	&SimonState::vc_2_call,
-	&SimonState::vc_3_new_thread,
+	&SimonState::vc_3_new_sprite,
 	&SimonState::vc_4_dummy_op,
 	&SimonState::vc_5_skip_if_neq,
 	&SimonState::vc_6_skip_ifn_sib_with_a,
@@ -52,10 +52,10 @@ static const VgaOpcodeProc vga_opcode_table[] = {
 	&SimonState::vc_19_chain_to_script,
 	&SimonState::vc_20_set_code_word,
 	&SimonState::vc_21_jump_if_code_word,
-	&SimonState::vc_22_set_pal,
-	&SimonState::vc_23_set_pri,
-	&SimonState::vc_24_set_image_xy,
-	&SimonState::vc_25_halt_thread,
+	&SimonState::vc_22_set_palette,
+	&SimonState::vc_23_set_priority,
+	&SimonState::vc_24_set_sprite_xy,
+	&SimonState::vc_25_halt_sprite,
 	&SimonState::vc_26_set_window,
 	&SimonState::vc_27_reset,
 	&SimonState::vc_28_dummy_op,
@@ -90,7 +90,7 @@ static const VgaOpcodeProc vga_opcode_table[] = {
 	&SimonState::vc_57_no_op,
 	&SimonState::vc_58,
 	&SimonState::vc_59,
-	&SimonState::vc_60_kill_thread,
+	&SimonState::vc_60_kill_sprite,
 	&SimonState::vc_61_sprite_change,
 	&SimonState::vc_62_palette_thing,
 	&SimonState::vc_63_palette_thing_2,
@@ -264,7 +264,7 @@ void SimonState::vc_2_call() {
 	_vc_ptr = vc_ptr_org;
 }
 
-void SimonState::vc_3_new_thread() {
+void SimonState::vc_3_new_sprite() {
 	uint16 a, b, c, d, e, f;
 	uint16 res;
 	VgaSprite *vsp;
@@ -1089,7 +1089,7 @@ void SimonState::vc_21_jump_if_code_word() {
 	}
 }
 
-void SimonState::vc_22_set_pal() {
+void SimonState::vc_22_set_palette() {
 	uint a = vc_read_next_word();
 	uint b = vc_read_next_word();
 	uint num = a == 0 ? 0x20 : 0x10;
@@ -1113,7 +1113,7 @@ void SimonState::vc_22_set_pal() {
 	_vga_sprite_changed++;
 }
 
-void SimonState::vc_23_set_pri() {
+void SimonState::vc_23_set_priority() {
 	VgaSprite *vsp = find_cur_sprite(), *vus2;
 	uint16 pri = vc_read_next_word();
 	VgaSprite bak;
@@ -1152,7 +1152,7 @@ void SimonState::vc_23_set_pri() {
 	_vga_sprite_changed++;
 }
 
-void SimonState::vc_24_set_image_xy() {
+void SimonState::vc_24_set_sprite_xy() {
 	VgaSprite *vsp = find_cur_sprite();
 	vsp->image = vc_read_var_or_word();
 
@@ -1172,7 +1172,7 @@ void SimonState::vc_24_set_image_xy() {
 	_vga_sprite_changed++;
 }
 
-void SimonState::vc_25_halt_thread() {
+void SimonState::vc_25_halt_sprite() {
 	VgaSprite *vsp = find_cur_sprite();
 	while (vsp->id != 0) {
 		memcpy(vsp, vsp + 1, sizeof(VgaSprite));
@@ -1598,7 +1598,7 @@ void SimonState::vc_58() {
 
 	vc_ptr = _vc_ptr;
 	_vc_ptr = (byte *)&tmp;
-	vc_23_set_pri();
+	vc_23_set_priority();
 
 	_vc_ptr = vc_ptr;
 	_vga_cur_sprite_id = sprite;
@@ -1639,7 +1639,7 @@ void SimonState::vc_kill_thread(uint file, uint sprite) {
 
 	vsp = find_cur_sprite();
 	if (vsp->id) {
-		vc_25_halt_thread();
+		vc_25_halt_sprite();
 
 		vte = _vga_timer_list;
 		while (vte->delay != 0) {
@@ -1658,7 +1658,7 @@ void SimonState::vc_kill_thread(uint file, uint sprite) {
 	_vc_ptr = vc_org;
 }
 
-void SimonState::vc_60_kill_thread() {
+void SimonState::vc_60_kill_sprite() {
 	uint file;
 
 	if (_game & GF_SIMON2) {