[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.438,1.439 vga.cpp,1.116,1.117

[Travis Howell]

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

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

No need to calculate values


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -d -r1.438 -r1.439
--- simon.cpp	28 Jun 2004 00:40:25 -0000	1.438
+++ simon.cpp	27 Jul 2004 07:21:28 -0000	1.439
@@ -2057,18 +2057,18 @@
 	time_t cur_time;
 
 	if (!(_game & GF_SIMON2)) {
-		uint subr_id = _variableArray[0x1FC / 2];
+		uint subr_id = _variableArray[254];
 		if (subr_id != 0) {
 			Subroutine *sub = getSubroutineByID(subr_id);
 			if (sub != NULL) {
 				startSubroutineEx(sub);
 				startUp_helper_2();
 			}
-			_variableArray[0x1FC / 2] = 0;
+			_variableArray[254] = 0;
 			_run_script_return_1 = false;
 		}
 	} else {
-		if (_variableArray[0x1FC / 2] || _variableArray[0x1F2 / 2]) {
+		if (_variableArray[254] || _variableArray[249]) {
 			hitarea_stuff_helper_2();
 		}
 	}
@@ -2086,26 +2086,26 @@
 	uint subr_id;
 	Subroutine *sub;
 
-	subr_id = _variableArray[0x1F2 / 2];
+	subr_id = _variableArray[249];
 	if (subr_id != 0) {
 		sub = getSubroutineByID(subr_id);
 		if (sub != NULL) {
-			_variableArray[0x1F2 / 2] = 0;
+			_variableArray[249] = 0;
 			startSubroutineEx(sub);
 			startUp_helper_2();
 		}
-		_variableArray[0x1F2 / 2] = 0;
+		_variableArray[249] = 0;
 	}
 
-	subr_id = _variableArray[0x1FC / 2];
+	subr_id = _variableArray[254];
 	if (subr_id != 0) {
 		sub = getSubroutineByID(subr_id);
 		if (sub != NULL) {
-			_variableArray[0x1FC / 2] = 0;
+			_variableArray[254] = 0;
 			startSubroutineEx(sub);
 			startUp_helper_2();
 		}
-		_variableArray[0x1FC / 2] = 0;
+		_variableArray[254] = 0;
 	}
 
 	_run_script_return_1 = false;
@@ -2427,7 +2427,7 @@
 		_vga_var3 = 0;
 		_vga_var5 = 134;
 		if (_variableArray[34] != -1)
-			_variableArray[502 / 2] = 0;
+			_variableArray[251] = 0;
 	}
 
 	vc_ptr_org = _vc_ptr;

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- vga.cpp	14 Mar 2004 17:53:19 -0000	1.116
+++ vga.cpp	27 Jul 2004 07:21:28 -0000	1.117
@@ -649,7 +649,7 @@
 		_vga_var7 = state.depack_src;
 		_vga_var5 = height;
 		if (_variableArray[34] == -1)
-			state.x = _variableArray[502 / 2];
+			state.x = _variableArray[251];
 
 		_x_scroll = state.x;