diff options
| -rw-r--r-- | simon/simon.cpp | 35 | ||||
| -rw-r--r-- | simon/simon.h | 6 |
2 files changed, 30 insertions, 11 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 2b1da0fab1..d120d7e6d8 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -371,6 +371,8 @@ SimonState::SimonState(GameDetector *detector, OSystem *syst) memset(_fcs_data_1, 0, sizeof(_fcs_data_1)); memset(_fcs_data_2, 0, sizeof(_fcs_data_2)); + _free_string_slot = 0; + memset(_pathfind_array, 0, sizeof(_pathfind_array)); memset(_palette_backup, 0, sizeof(_palette_backup)); @@ -378,14 +380,35 @@ SimonState::SimonState(GameDetector *detector, OSystem *syst) memset(_video_buf_1, 0, sizeof(_video_buf_1)); -//... TODO: init more member vars - _fcs_list = new FillOrCopyStruct[16]; - _free_string_slot = 0; - + _num_screen_updates = 0; + _vga_tick_counter = 0; + + _sound = 0; + + _effects_paused = false; + _ambient_paused = false; + _music_paused = false; + + _timer_id = 0; + _dump_file = 0; + _saveload_row_curpos = 0; + _num_savegame_rows = 0; + _savedialog_flag = false; + _save_or_load = false; + _saveload_flag = false; + + _sdl_mouse_x = 0; + _sdl_mouse_y = 0; + + _sdl_buf_3 = 0; + _sdl_buf = 0; + _sdl_buf_attached = 0; + + // Setup midi driver if (!driver) driver = MidiDriver_ADLIB_create(); @@ -406,10 +429,6 @@ SimonState::SimonState(GameDetector *detector, OSystem *syst) _debugMode = detector->_debugMode; _debugLevel = detector->_debugLevel; _language = detector->_language; - - _effects_paused = false; - _ambient_paused = false; - _music_paused = false; } SimonState::~SimonState() { diff --git a/simon/simon.h b/simon/simon.h index b94573862e..c24922c777 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -353,6 +353,9 @@ public: byte *_sdl_buf; byte *_sdl_buf_attached; + RandomSource _rnd; + + SimonState(GameDetector *detector, OSystem *syst); virtual ~SimonState(); @@ -754,7 +757,6 @@ public: byte *vc_10_depack_swap(byte *src, uint w, uint h); - Item *getNextItemPtrStrange(); bool save_game(uint slot, const char *caption); @@ -798,8 +800,6 @@ public: void show_it(void *buf); char *gen_savename(int slot); - - RandomSource _rnd; }; void palette_fadeout(uint32 *pal_values, uint num); |