[Scummvm-cvs-logs] CVS: scummvm/simon simon.h,1.24,1.25

[Max Horn]

Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv7746/simon

Modified Files:
	simon.h 
Log Message:
added common Engine base class for Scumm and SimonState (not yet very useful)

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- simon.h	4 Aug 2002 13:25:06 -0000	1.24
+++ simon.h	14 Aug 2002 10:18:03 -0000	1.25
@@ -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 @@
 };
 
 
-class SimonState {
+class SimonState : public Engine {
 public:
-	OSystem *_system;
-
 	char *_game_path;
 
 	byte *_vc_ptr;								/* video code ptr */
@@ -551,8 +547,6 @@
 
 	byte _fcs_data_1[8];
 	bool _fcs_data_2[8];
-
-	SoundMixer _mixer[1];
 
 	ThreeValues _threevalues_1, _threevalues_2, _threevalues_3, _threevalues_4;