From bfce5e500aa09d36b974c29acf91780e0b26b459 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sun, 5 Oct 2003 20:21:20 +0000 Subject: renamed SkyState to SkyEngine; cleaned the #include dependency mess a bit (try to only #include files when you *have* to -> this reduces compilation time to a minimum when header file changes are made) svn-id: r10622 --- sky/sky.h | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) (limited to 'sky/sky.h') diff --git a/sky/sky.h b/sky/sky.h index 573fc6a807..6f80ef8819 100644 --- a/sky/sky.h +++ b/sky/sky.h @@ -22,24 +22,8 @@ #ifndef SKYMAIN_H #define SKYMAIN_H -#include +#include "stdafx.h" #include "base/engine.h" -#include "common/util.h" -#include "common/timer.h" -#include "sound/mixer.h" -#include "sky/sound.h" -#include "sky/text.h" -#include "sky/disk.h" -#include "sky/struc.h" -#include "sky/screen.h" -#include "sky/music/musicbase.h" -#include "sky/music/adlibmusic.h" -#include "sky/music/gmmusic.h" -#include "sky/music/mt32music.h" -#include "sky/mouse.h" -#include "sky/control.h" -#include "sky/intro.h" -#include "common/config-file.h" struct SystemVars { uint32 systemFlags; @@ -53,12 +37,18 @@ struct SystemVars { bool quitting; }; +struct Compact; +class SkySound; +class SkyDisk; +class SkyText; class SkyLogic; +class SkyMouse; class SkyScreen; class SkyControl; +class SkyMusicBase; class SkyIntro; -class SkyState : public Engine { +class SkyEngine : public Engine { void errorString(const char *buf_input, char *buf_output); protected: byte _game; @@ -71,8 +61,6 @@ protected: int _numScreenUpdates; - Timer *_timer; - FILE *_dump_file; int _number_of_savegames; @@ -92,8 +80,8 @@ protected: GameDetector *_detector; // necessary for music public: - SkyState(GameDetector *detector, OSystem *syst); - virtual ~SkyState(); + SkyEngine(GameDetector *detector, OSystem *syst); + virtual ~SkyEngine(); static bool isDemo(void); static bool isCDVersion(void); -- cgit v1.2.3