added common Engine base class for Scumm and SimonState (not yet very useful)

svn-id: r4742

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;