[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.39,1.40 intern.h,1.40,1.41 items.cpp,1.130,1.131 saveload.cpp,1.18,1.19 simon.cpp,1.521,1.522 simon.h,1.150,1.151 verb.cpp,1.30,1.31

[kirben]

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

Modified Files:
	charset.cpp intern.h items.cpp saveload.cpp simon.cpp simon.h 
	verb.cpp 
Log Message:

Cleanup


Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- charset.cpp	18 Oct 2005 01:30:22 -0000	1.39
+++ charset.cpp	19 Oct 2005 10:54:22 -0000	1.40
@@ -55,7 +55,7 @@
 	if (_fcsData2[i]) {
 		lock();
 		fcs = _fcsPtrArray3[i];
-		fcs_unk_proc_1(i, fcs->fcs_data->item_ptr, fcs->fcs_data->unk1, fcs->fcs_data->unk2);
+		drawIconArray(i, fcs->fcs_data->item_ptr, fcs->fcs_data->unk1, fcs->fcs_data->unk2);
 		_fcsData2[i] = 0;
 		unlock();
 	}

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- intern.h	18 Oct 2005 01:30:22 -0000	1.40
+++ intern.h	19 Oct 2005 10:54:22 -0000	1.41
@@ -79,7 +79,7 @@
 	int16 unk1;
 	Item *item_ptr;
 	FillOrCopyDataEntry e[64];
-	int16 unk3, unk4;
+	int16 upArrow, downArrow;
 	uint16 unk2;
 };
 

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- items.cpp	18 Oct 2005 01:30:22 -0000	1.130
+++ items.cpp	19 Oct 2005 10:54:22 -0000	1.131
@@ -145,7 +145,7 @@
 			break;
 
 		case 23:{
-				condition = o_unk_23(getVarOrWord());
+				condition = o_chance(getVarOrWord());
 			}
 			break;
 
@@ -646,7 +646,7 @@
 				Item *item = getNextItemPtr();
 				uint fcs_index = getVarOrByte();
 				lock();
-				fcs_unk_proc_1(fcs_index, item, 0, 0);
+				drawIconArray(fcs_index, item, 0, 0);
 				unlock();
 			}
 			break;
@@ -701,7 +701,7 @@
 				uint fcs_index = getVarOrByte();
 				uint a = 1 << getVarOrByte();
 				lock();
-				fcs_unk_proc_1(fcs_index, item, 1, a);
+				drawIconArray(fcs_index, item, 1, a);
 				unlock();
 			}
 			break;
@@ -775,7 +775,7 @@
 			break;
 
 		case 137:{
-				o_unk_137(getVarOrByte());
+				o_restoreIconArray(getVarOrByte());
 			}
 			break;
 
@@ -1267,7 +1267,7 @@
 }
 
 
-bool SimonEngine::o_unk_23(uint a) {
+bool SimonEngine::o_chance(uint a) {
 	if (a == 0)
 		return 0;
 
@@ -1427,13 +1427,13 @@
 	}
 }
 
-void SimonEngine::o_unk_137(uint fcs_index) {
+void SimonEngine::o_restoreIconArray(uint fcs_index) {
 	FillOrCopyStruct *fcs;
 
 	fcs = _fcsPtrArray3[fcs_index & 7];
 	if (fcs->fcs_data == NULL)
 		return;
-	fcs_unk_proc_1(fcs_index, fcs->fcs_data->item_ptr, fcs->fcs_data->unk1, fcs->fcs_data->unk2);
+	drawIconArray(fcs_index, fcs->fcs_data->item_ptr, fcs->fcs_data->unk1, fcs->fcs_data->unk2);
 }
 
 void SimonEngine::o_unk_138() {
@@ -1648,7 +1648,7 @@
 
 void SimonEngine::o_unk_103() {
 	lock();
-	fcs_unk1(_fcsUnk1);
+	removeIconArray(_fcsUnk1);
 	showMessageFormat("\x0C");
 	unlock();
 }

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/saveload.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- saveload.cpp	18 Oct 2005 01:30:22 -0000	1.18
+++ saveload.cpp	19 Oct 2005 10:54:22 -0000	1.19
@@ -123,7 +123,7 @@
 		} else {
 			// Redraw Inventory
 			lock();
-			fcs_unk_proc_1(2, getItem1Ptr(), 0, 0);
+			drawIconArray(2, getItem1Ptr(), 0, 0);
 			unlock();
 			// Reset engine?
 			vc_set_bit_to(97, true);

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -d -r1.521 -r1.522
--- simon.cpp	18 Oct 2005 01:30:22 -0000	1.521
+++ simon.cpp	19 Oct 2005 10:54:22 -0000	1.522
@@ -75,7 +75,7 @@
 	{"simon2mac", "Simon the Sorcerer 2 Talkie (Amiga or Mac)", GAME_SIMON2WIN, 0},
 	{"simon1cd32", "Simon the Sorcerer 1 Talkie (Amiga CD32)", GAME_SIMON1CD32, "gameamiga"},
 	{"simon1demo", "Simon the Sorcerer 1 (DOS Demo)", GAME_SIMON1DEMO, "GDEMO"},
-//	{"feeble", "The Feeble Files", GAME_FEEBLEFILES, "GAME22"},
+	{"feeble", "The Feeble Files", GAME_FEEBLEFILES, "GAME22"},
 
 	{NULL, NULL, 0, NULL}
 };
@@ -1232,7 +1232,7 @@
 				_fcsData2[i] = true;
 			} else {
 				_fcsData2[i] = false;
-				fcs_unk_proc_1(i, item, fcs->fcs_data->unk1, fcs->fcs_data->unk2);
+				drawIconArray(i, item, fcs->fcs_data->unk1, fcs->fcs_data->unk2);
 			}
 		}
 	}
@@ -1829,7 +1829,7 @@
 	_needHitAreaRecalc = 0;
 }
 
-void SimonEngine::fcs_unk_proc_1(uint fcs_index, Item *item_ptr, int unk1, int unk2) {
+void SimonEngine::drawIconArray(uint fcs_index, Item *item_ptr, int unk1, int unk2) {
 	Item *item_ptr_org = item_ptr;
 	FillOrCopyStruct *fcs_ptr;
 	uint width_div_3, height_div_3;
@@ -1853,12 +1853,12 @@
 		return;
 
 	if (fcs_ptr->fcs_data)
-		fcs_unk1(fcs_index);
+		removeIconArray(fcs_index);
 
 	fcs_ptr->fcs_data = (FillOrCopyData *) malloc(sizeof(FillOrCopyData));
 	fcs_ptr->fcs_data->item_ptr = item_ptr;
-	fcs_ptr->fcs_data->unk3 = -1;
-	fcs_ptr->fcs_data->unk4 = -1;
+	fcs_ptr->fcs_data->upArrow = -1;
+	fcs_ptr->fcs_data->downArrow = -1;
 	fcs_ptr->fcs_data->unk1 = unk1;
 	fcs_ptr->fcs_data->unk2 = unk2;
 
@@ -1930,8 +1930,8 @@
 void SimonEngine::fcs_unk_proc_2(FillOrCopyStruct *fcs, uint fcs_index) {
 	setup_hit_areas(fcs, fcs_index);
 
-	fcs->fcs_data->unk3 = _scrollUpHitArea;
-	fcs->fcs_data->unk4 = _scrollDownHitArea;
+	fcs->fcs_data->upArrow = _scrollUpHitArea;
+	fcs->fcs_data->downArrow = _scrollDownHitArea;
 }
 
 void SimonEngine::setup_hit_areas(FillOrCopyStruct *fcs, uint fcs_index) {
@@ -3040,7 +3040,7 @@
 void SimonEngine::fcs_delete(uint a) {
 	if (_fcsPtrArray3[a] == NULL)
 		return;
-	fcs_unk1(a);
+	removeIconArray(a);
 	video_copy_if_flag_0x8_c(_fcsPtrArray3[a]);
 	_fcsPtrArray3[a] = NULL;
 	if (_fcsUnk1 == a) {
@@ -3064,8 +3064,7 @@
 }
 
 // OK
-FillOrCopyStruct *SimonEngine::fcs_alloc(uint x, uint y, uint w, uint h, uint flags, uint fill_color,
-																				uint unk4) {
+FillOrCopyStruct *SimonEngine::fcs_alloc(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint text_color) {
 	FillOrCopyStruct *fcs;
 
 	fcs = _fcs_list;
@@ -3079,7 +3078,7 @@
 	fcs->height = h;
 	fcs->flags = flags;
 	fcs->fill_color = fill_color;
-	fcs->text_color = unk4;
+	fcs->text_color = text_color;
 	fcs->textColumn = 0;
 	fcs->textRow = 0;
 	fcs->textColumnOffset = 0;
@@ -3142,7 +3141,7 @@
 }
 
 // ok
-void SimonEngine::fcs_unk1(uint fcs_index) {
+void SimonEngine::removeIconArray(uint fcs_index) {
 	FillOrCopyStruct *fcs;
 	uint16 fcsunk1;
 	uint16 i;
@@ -3161,12 +3160,12 @@
 		delete_hitarea_by_index(fcs->fcs_data->e[i].hit_area);
 	}
 
-	if (fcs->fcs_data->unk3 != -1) {
-		delete_hitarea_by_index(fcs->fcs_data->unk3);
+	if (fcs->fcs_data->upArrow != -1) {
+		delete_hitarea_by_index(fcs->fcs_data->upArrow);
 	}
 
-	if (fcs->fcs_data->unk4 != -1) {
-		delete_hitarea_by_index(fcs->fcs_data->unk4);
+	if (fcs->fcs_data->downArrow != -1) {
+		delete_hitarea_by_index(fcs->fcs_data->downArrow);
 		if (!(_game & GF_SIMON2))
 			fcs_unk_5(fcs, fcs_index);
 	}

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- simon.h	18 Oct 2005 01:30:22 -0000	1.150
+++ simon.h	19 Oct 2005 10:54:22 -0000	1.151
@@ -465,7 +465,7 @@
 	void unlinkItem(Item *item);
 	void linkItem(Item *item, Item *parent);
 
-	bool o_unk_23(uint a);
+	bool o_chance(uint a);
 
 	void o_kill_sprite_simon1(uint a);
 	void o_kill_sprite_simon2(uint a, uint b);
@@ -496,7 +496,7 @@
 	void o_save_game();
 	void o_load_game();
 	void o_quit_if_user_presses_y();
-	void o_unk_137(uint a);
+	void o_restoreIconArray(uint a);
 	void o_unk_138();
 	void killAllTimers();
 
@@ -524,7 +524,7 @@
 	void lock();
 	void unlock();
 
-	void fcs_unk_proc_1(uint i, Item *item_ptr, int unk1, int unk2);
+	void drawIconArray(uint i, Item *item_ptr, int unk1, int unk2);
 
 	void loadTextIntoMem(uint string_id);
 	void loadTablesIntoMem(uint subr_id);
@@ -572,7 +572,7 @@
 	void pollMouseXY();
 	void draw_mouse_pointer();
 
-	void fcs_unk1(uint fcs_index);
+	void removeIconArray(uint fcs_index);
 	void draw_icon_c(FillOrCopyStruct *fcs, uint icon, uint x, uint y);
 	bool has_item_childflag_0x10(Item *item);
 	uint item_get_icon_number(Item *item);
@@ -599,7 +599,7 @@
 	void o_unk26_helper(uint a, uint b, uint c, uint d, uint e, uint f, uint g, uint h);
 	void talk_with_speech(uint speech_id, uint vga_sprite_id);
 	void talk_with_text(uint vga_sprite_id, uint color, const char *string_ptr, int16 x, int16 y, int16 width);
-	FillOrCopyStruct *fcs_alloc(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint unk4);
+	FillOrCopyStruct *fcs_alloc(uint x, uint y, uint w, uint h, uint flags, uint fill_color, uint text_color);
 
 	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);

Index: verb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/verb.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- verb.cpp	18 Oct 2005 01:30:22 -0000	1.30
+++ verb.cpp	19 Oct 2005 10:54:22 -0000	1.31
@@ -436,7 +436,7 @@
 		return;
 
 	lock();
-	fcs_unk_proc_1(index, fcs->fcs_data->item_ptr, fcs->fcs_data->unk1 - 1, fcs->fcs_data->unk2);
+	drawIconArray(index, fcs->fcs_data->item_ptr, fcs->fcs_data->unk1 - 1, fcs->fcs_data->unk2);
 	unlock();
 }
 
@@ -446,7 +446,7 @@
 	index = get_fcs_ptr_3_index(fcs);
 
 	lock();
-	fcs_unk_proc_1(index, fcs->fcs_data->item_ptr, fcs->fcs_data->unk1 + 1, fcs->fcs_data->unk2);
+	drawIconArray(index, fcs->fcs_data->item_ptr, fcs->fcs_data->unk1 + 1, fcs->fcs_data->unk2);
 	unlock();
 }