[Scummvm-cvs-logs] CVS: scummvm/simon items.cpp,1.82,1.83 res.cpp,1.22,1.23 simon.cpp,1.243,1.244 simon.h,1.77,1.78

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv29325

Modified Files:
	items.cpp res.cpp simon.cpp simon.h 
Log Message:
cleanup

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- items.cpp	5 Jun 2003 13:21:03 -0000	1.82
+++ items.cpp	15 Jun 2003 13:07:06 -0000	1.83
@@ -1145,7 +1145,6 @@
 }
 
 int SimonEngine::startSubroutineEx(Subroutine *sub) {
-	_item_1_ptr = _item_1;
 	return startSubroutine(sub);
 }
 

Index: res.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/res.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- res.cpp	14 Jun 2003 14:58:08 -0000	1.22
+++ res.cpp	15 Jun 2003 13:07:06 -0000	1.23
@@ -114,7 +114,6 @@
 
 	num_inited_objects = allocGamePcVars(&in);
 
-	allocItem1();
 	loginPlayer();
 	readGamePcText(&in);
 

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- simon.cpp	15 Jun 2003 09:54:16 -0000	1.243
+++ simon.cpp	15 Jun 2003 13:07:06 -0000	1.244
@@ -268,8 +268,6 @@
 
 	_subject_item = 0;
 	_object_item = 0;
-	_item_1_ptr = 0;
-	_item_ptr_B = 0;
 	_item_1 = 0;
 
 	_hitarea_object_item = 0;
@@ -522,7 +520,7 @@
 	_itemarray_size = item_array_size;
 	_itemarray_inited = item_array_inited;
 
-	for (i = 2; i != item_array_inited; i++) {
+	for (i = 1; i < item_array_inited; i++) {
 		_itemarray_ptr[i] = (Item *)allocateItem(sizeof(Item));
 	}
 
@@ -533,12 +531,6 @@
 	return item_array_inited;
 }
 
-Item *SimonEngine::allocItem1() {
-	Item *item = (Item *)allocateItem(sizeof(Item));
-	_itemarray_ptr[1] = item;
-	return item;
-}
-
 void SimonEngine::loginPlayerHelper(Item *item, int a, int b) {
 	Child9 *child;
 
@@ -552,19 +544,17 @@
 }
 
 void SimonEngine::loginPlayer() {
-	Item *item;
 	Child *child;
 
-	item = _itemarray_ptr[1];
-	item->unk2 = -1;
-	item->unk1 = 10000;
-	_item_1 = item;
+	_item_1 = _itemarray_ptr[1];
+	_item_1->unk2 = -1;
+	_item_1->unk1 = 10000;
 
-	child = (Child *)allocateChildBlock(item, 3, sizeof(Child));
+	child = (Child *)allocateChildBlock(_item_1, 3, sizeof(Child));
 	if (child == NULL)
 		error("player create failure");
 
-	loginPlayerHelper(item, 0, 0);
+	loginPlayerHelper(_item_1, 0, 0);
 }
 
 void SimonEngine::allocateStringTable(int num) {
@@ -808,15 +798,13 @@
 }
 
 Item *SimonEngine::getItem1Ptr() {
-	if (_item_1_ptr)
-		return _item_1_ptr;
+	if (_item_1)
+		return _item_1;
 	return _dummy_item_1;
 }
 
 Item *SimonEngine::getItemPtrB() {
 	error("getItemPtrB: is this code ever used?");
-	if (_item_ptr_B)
-		return _item_ptr_B;
 	return _dummy_item_1;
 }
 
@@ -1294,11 +1282,9 @@
 }
 
 void SimonEngine::o_setup_cond_c() {
-	Item *item = _item_1;
 
 	setup_cond_c_helper();
 
-	_item_1_ptr = item;
 	_object_item = _hitarea_object_item;
 
 	if (_object_item == _dummy_item_2)
@@ -1939,8 +1925,6 @@
 void SimonEngine::handle_verb_clicked(uint verb) {
 	Subroutine *sub;
 	int result;
-
-	_item_1_ptr = _item_1;
 
 	_object_item = _hitarea_object_item;
 	if (_object_item == _dummy_item_2) {

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- simon.h	15 Jun 2003 11:52:42 -0000	1.77
+++ simon.h	15 Jun 2003 13:07:06 -0000	1.78
@@ -204,7 +204,7 @@
 	FillOrCopyStruct *_fcs_ptr_1;
 
 	Item *_subject_item, *_object_item;
-	Item *_item_1_ptr, *_item_ptr_B;
+	Item *_item_1_ptr;
 	Item *_item_1;
 
 	Item *_hitarea_object_item;
@@ -360,7 +360,6 @@
 
 protected:
 	int allocGamePcVars(File *in);
-	Item *allocItem1();
 	void loginPlayerHelper(Item *item, int a, int b);
 	void loginPlayer();
 	void allocateStringTable(int num);