diff options
| author | Max Horn | 2003-06-21 15:42:20 +0000 |
|---|---|---|
| committer | Max Horn | 2003-06-21 15:42:20 +0000 |
| commit | ceb1005f6cc4ff1860167810aacf51ae94d2d187 (patch) | |
| tree | 169f15a0ef78efe257a6c36b80cd71df5511ebd6 | |
| parent | 3de24123e737a0bc4584b3a59db553d74a2dfdf0 (diff) | |
| download | scummvm-rg350-ceb1005f6cc4ff1860167810aacf51ae94d2d187.tar.gz scummvm-rg350-ceb1005f6cc4ff1860167810aacf51ae94d2d187.tar.bz2 scummvm-rg350-ceb1005f6cc4ff1860167810aacf51ae94d2d187.zip | |
some more memory inits; cleanup
svn-id: r8581
| -rw-r--r-- | simon/simon.cpp | 5 | ||||
| -rw-r--r-- | simon/simon.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index c86b7a2563..05319d679d 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -277,9 +277,8 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) _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 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst) _free_string_slot = 0; + memset(_stringReturnBuffer, 0, sizeof(_stringReturnBuffer)); + memset(_pathfind_array, 0, sizeof(_pathfind_array)); memset(_palette_backup, 0, sizeof(_palette_backup)); diff --git a/simon/simon.h b/simon/simon.h index af5548b59b..852cea12eb 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -194,9 +194,8 @@ protected: 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 @@ protected: FillOrCopyStruct *_fcs_ptr_1; Item *_subject_item, *_object_item; - Item *_item_1_ptr; Item *_item_1; Item *_hitarea_object_item; |