[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.538,1.539 simon.h,1.159,1.160

[kirben]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27782/simon

Modified Files:
	simon.cpp simon.h 
Log Message:

Cleanup.


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -d -r1.538 -r1.539
--- simon.cpp	12 Nov 2005 08:04:10 -0000	1.538
+++ simon.cpp	12 Nov 2005 08:20:47 -0000	1.539
@@ -1830,18 +1830,18 @@
 	fcs_ptr->fcs_data->e[k].item = NULL;
 
 	if (j != 0 || fcs_ptr->fcs_data->unk1 != 0) {
-		fcs_unk_proc_2(fcs_ptr, fcs_index);
+		addArrows(fcs_ptr, fcs_index);
 	}
 }
 
-void SimonEngine::fcs_unk_proc_2(FillOrCopyStruct *fcs, uint fcs_index) {
-	setup_hit_areas(fcs, fcs_index);
+void SimonEngine::addArrows(FillOrCopyStruct *fcs, uint fcs_index) {
+	setArrowHitAreas(fcs, fcs_index);
 
 	fcs->fcs_data->upArrow = _scrollUpHitArea;
 	fcs->fcs_data->downArrow = _scrollDownHitArea;
 }
 
-void SimonEngine::setup_hit_areas(FillOrCopyStruct *fcs, uint fcs_index) {
+void SimonEngine::setArrowHitAreas(FillOrCopyStruct *fcs, uint fcs_index) {
 	HitArea *ha;
 
 	ha = findEmptyHitArea();
@@ -3058,7 +3058,7 @@
 	if (fcs->fcs_data->downArrow != -1) {
 		delete_hitarea_by_index(fcs->fcs_data->downArrow);
 		if (getGameType() == GType_SIMON1)
-			fcs_unk_5(fcs, fcs_index);
+			removeArrows(fcs, fcs_index);
 	}
 
 	free(fcs->fcs_data);
@@ -3069,7 +3069,7 @@
 }
 
 // ok
-void SimonEngine::fcs_unk_5(FillOrCopyStruct *fcs, uint fcs_index) {
+void SimonEngine::removeArrows(FillOrCopyStruct *fcs, uint fcs_index) {
 	o_kill_sprite_simon1(128);
 }
 

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- simon.h	12 Nov 2005 06:01:24 -0000	1.159
+++ simon.h	12 Nov 2005 08:20:47 -0000	1.160
@@ -626,7 +626,7 @@
 	bool has_item_childflag_0x10(Item *item);
 	uint item_get_icon_number(Item *item);
 	uint setup_icon_hit_area(FillOrCopyStruct *fcs, uint x, uint y, uint icon_number, Item *item_ptr);
-	void fcs_unk_proc_2(FillOrCopyStruct *fcs, uint fcs_index);
+	void addArrows(FillOrCopyStruct *fcs, uint fcs_index);
 
 	void loadIconFile();
 	void processSpecialKeys();
@@ -653,7 +653,7 @@
 	void render_string_amiga(uint vga_sprite_id, uint color, uint width, uint height, const char *txt);
 	void render_string(uint vga_sprite_id, uint color, uint width, uint height, const char *txt);
 
-	void setup_hit_areas(FillOrCopyStruct *fcs, uint fcs_index);
+	void setArrowHitAreas(FillOrCopyStruct *fcs, uint fcs_index);
 
 	byte *setup_vga_destination(uint32 size);
 	void vga_buf_unk_proc3(byte *end);
@@ -783,7 +783,7 @@
 	void video_copy_if_flag_0x8_c(FillOrCopyStruct *fcs);
 	void delete_hitarea_by_index(uint index);
 
-	void fcs_unk_5(FillOrCopyStruct *fcs, uint fcs_index);
+	void removeArrows(FillOrCopyStruct *fcs, uint fcs_index);
 	void fcs_putchar(uint a);
 
 	void copy_img_from_3_to_2(FillOrCopyStruct *fcs);