diff options
author | Max Horn | 2002-08-14 10:18:03 +0000 |
---|---|---|
committer | Max Horn | 2002-08-14 10:18:03 +0000 |
commit | 7f3ba176e1c5ca1e816e0f55c6fbf76c77b67d6c (patch) | |
tree | e7ee8cebdcf6ab09e873ff07d2aaa588c4b61c57 /simon/simon.h | |
parent | 2125df5f6d7ff229be4cd1ba3c9a8db673e3475c (diff) | |
download | scummvm-rg350-7f3ba176e1c5ca1e816e0f55c6fbf76c77b67d6c.tar.gz scummvm-rg350-7f3ba176e1c5ca1e816e0f55c6fbf76c77b67d6c.tar.bz2 scummvm-rg350-7f3ba176e1c5ca1e816e0f55c6fbf76c77b67d6c.zip |
added common Engine base class for Scumm and SimonState (not yet very useful)
svn-id: r4742
Diffstat (limited to 'simon/simon.h')
-rw-r--r-- | simon/simon.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/simon/simon.h b/simon/simon.h index e14ab9eaa8..1ce7ee452a 100644 --- a/simon/simon.h +++ b/simon/simon.h @@ -21,9 +21,7 @@ #include <time.h> #include <sys/stat.h> -#include "scummsys.h" -#include "system.h" -#include "../sound/mixer.h" +#include "engine.h" /* Various other settings */ //#define DUMP_CONTINOUS_MAINSCRIPT @@ -354,10 +352,8 @@ struct GameSpecificSettings { }; -class SimonState { +class SimonState : public Engine { public: - OSystem *_system; - char *_game_path; byte *_vc_ptr; /* video code ptr */ @@ -552,8 +548,6 @@ public: byte _fcs_data_1[8]; bool _fcs_data_2[8]; - SoundMixer _mixer[1]; - ThreeValues _threevalues_1, _threevalues_2, _threevalues_3, _threevalues_4; int _free_string_slot; |