[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.246,1.247 simon.h,1.78,1.79

[Max Horn]

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

Modified Files:
	simon.cpp simon.h 
Log Message:
some more memory inits; cleanup

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- simon.cpp	21 Jun 2003 15:32:35 -0000	1.246
+++ simon.cpp	21 Jun 2003 15:42:20 -0000	1.247
@@ -277,9 +277,8 @@
 	_vga_var2 = 0;
 	_vga_var3 = 0;
 	_vga_var5 = 0;
-	_vga_var8 = 0;
-
 	_vga_var7 = 0;
+	_vga_var8 = 0;
 
 	_script_cond_a = 0;
 	_script_cond_b = 0;
@@ -394,6 +393,8 @@
 
 	_free_string_slot = 0;
 	
+	memset(_stringReturnBuffer, 0, sizeof(_stringReturnBuffer));
+
 	memset(_pathfind_array, 0, sizeof(_pathfind_array));
 
 	memset(_palette_backup, 0, sizeof(_palette_backup));

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- simon.h	15 Jun 2003 13:07:06 -0000	1.78
+++ simon.h	21 Jun 2003 15:42:20 -0000	1.79
@@ -194,9 +194,8 @@
 	int16 _script_unk_1;
 	bool _vga_var6;
 	int _x_scroll, _vga_var1, _vga_var2, _vga_var3, _vga_var5;
-	byte _vga_var8;
-
 	byte *_vga_var7;
+	byte _vga_var8;
 
 	int16 _script_cond_a, _script_cond_b, _script_cond_c;
 
@@ -204,7 +203,6 @@
 	FillOrCopyStruct *_fcs_ptr_1;
 
 	Item *_subject_item, *_object_item;
-	Item *_item_1_ptr;
 	Item *_item_1;
 
 	Item *_hitarea_object_item;