aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorMax Horn2003-05-20 14:34:07 +0000
committerMax Horn2003-05-20 14:34:07 +0000
commit5f068688e92d3429e7a824e29f29fa4f4b67a0ee (patch)
treeb0531d7db7f870faef3ea478370237a1854a5858 /simon
parent7d4442fca5378bc4c813d85f7114885ebe1c8352 (diff)
downloadscummvm-rg350-5f068688e92d3429e7a824e29f29fa4f4b67a0ee.tar.gz
scummvm-rg350-5f068688e92d3429e7a824e29f29fa4f4b67a0ee.tar.bz2
scummvm-rg350-5f068688e92d3429e7a824e29f29fa4f4b67a0ee.zip
init even more simon member vars
svn-id: r7728
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp22
-rw-r--r--simon/simon.h6
2 files changed, 28 insertions, 0 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 4af4fe5963..61dddac788 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -361,6 +361,28 @@ SimonState::SimonState(GameDetector *detector, OSystem *syst)
_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];
diff --git a/simon/simon.h b/simon/simon.h
index 3080798b8a..80b7288254 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -50,6 +50,7 @@ struct TimeEvent;
struct ThreeValues {
int16 a, b, c;
+ ThreeValues() { memset(this, 0, sizeof(*this)); }
};
struct HitArea {
@@ -61,12 +62,14 @@ struct HitArea {
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 @@ struct VgaSprite {
uint16 unk4;
uint16 priority;
uint16 unk6, unk7;
+ VgaSprite() { memset(this, 0, sizeof(*this)); }
};
struct VgaSleepStruct {
@@ -84,6 +88,7 @@ struct VgaSleepStruct {
byte *code_ptr;
uint16 sprite_id;
uint16 cur_vga_file;
+ VgaSleepStruct() { memset(this, 0, sizeof(*this)); }
};
struct VgaTimerEntry {
@@ -91,6 +96,7 @@ struct VgaTimerEntry {
byte *script_pointer;
uint16 sprite_id;
uint16 cur_vga_file;
+ VgaTimerEntry() { memset(this, 0, sizeof(*this)); }
};
struct GameSpecificSettings;