[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.192,1.193 simon.h,1.60,1.61
Max Horn
fingolfin at users.sourceforge.net
Tue May 20 07:35:06 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv29702
Modified Files:
simon.cpp simon.h
Log Message:
init even more simon member vars
Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- simon.cpp 20 May 2003 14:12:57 -0000 1.192
+++ simon.cpp 20 May 2003 14:34:06 -0000 1.193
@@ -361,6 +361,28 @@
_next_vga_timer_to_process = 0;
+ memset(_vc_item_array, 0, sizeof(_vc_item_array));
+ memset(_item_array_6, 0, sizeof(_item_array_6));
+
+ memset(_stringid_array_2, 0, sizeof(_stringid_array_2));
+ memset(_stringid_array_3, 0, sizeof(_stringid_array_3));
+ memset(_array_4, 0, sizeof(_array_4));
+
+ memset(_bit_array, 0, sizeof(_bit_array));
+ memset(_variableArray, 0, sizeof(_variableArray));
+
+ memset(_fcs_ptr_array_3, 0, sizeof(_fcs_ptr_array_3));
+
+ memset(_fcs_data_1, 0, sizeof(_fcs_data_1));
+ memset(_fcs_data_2, 0, sizeof(_fcs_data_2));
+
+ memset(_pathfind_array, 0, sizeof(_pathfind_array));
+
+ memset(_palette_backup, 0, sizeof(_palette_backup));
+ memset(_palette, 0, sizeof(_palette));
+
+ memset(_video_buf_1, 0, sizeof(_video_buf_1));
+
//... TODO: init more member vars
_fcs_list = new FillOrCopyStruct[16];
Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- simon.h 20 May 2003 08:49:13 -0000 1.60
+++ simon.h 20 May 2003 14:34:07 -0000 1.61
@@ -50,6 +50,7 @@
struct ThreeValues {
int16 a, b, c;
+ ThreeValues() { memset(this, 0, sizeof(*this)); }
};
struct HitArea {
@@ -61,12 +62,14 @@
Item *item_ptr;
uint16 unk3;
uint16 layer;
+ HitArea() { memset(this, 0, sizeof(*this)); }
};
struct VgaPointersEntry {
byte *vgaFile1;
byte *vgaFile2;
uint32 dd;
+ VgaPointersEntry() { memset(this, 0, sizeof(*this)); }
};
struct VgaSprite {
@@ -77,6 +80,7 @@
uint16 unk4;
uint16 priority;
uint16 unk6, unk7;
+ VgaSprite() { memset(this, 0, sizeof(*this)); }
};
struct VgaSleepStruct {
@@ -84,6 +88,7 @@
byte *code_ptr;
uint16 sprite_id;
uint16 cur_vga_file;
+ VgaSleepStruct() { memset(this, 0, sizeof(*this)); }
};
struct VgaTimerEntry {
@@ -91,6 +96,7 @@
byte *script_pointer;
uint16 sprite_id;
uint16 cur_vga_file;
+ VgaTimerEntry() { memset(this, 0, sizeof(*this)); }
};
struct GameSpecificSettings;
More information about the Scummvm-git-logs
mailing list