aboutsummaryrefslogtreecommitdiff
path: root/sky/sky.h
diff options
context:
space:
mode:
authorOliver Kiehl2003-04-25 15:17:53 +0000
committerOliver Kiehl2003-04-25 15:17:53 +0000
commitc36bdb3e118670cafdde92659db0719438dc8487 (patch)
treefdc98c37f55c5bf02b39ae05e2506468ea734fab /sky/sky.h
parentda4a76ed04bd197a9527802d4b72556786226f37 (diff)
downloadscummvm-rg350-c36bdb3e118670cafdde92659db0719438dc8487.tar.gz
scummvm-rg350-c36bdb3e118670cafdde92659db0719438dc8487.tar.bz2
scummvm-rg350-c36bdb3e118670cafdde92659db0719438dc8487.zip
Committing my stuff under pressure from Endy ;)
please note that there are still many bugs in here. several stuff isn't endian safe either. SkyLogic needs to get split up as well. svn-id: r7106
Diffstat (limited to 'sky/sky.h')
-rw-r--r--sky/sky.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/sky/sky.h b/sky/sky.h
index 24d9ec5e7d..4bc3540287 100644
--- a/sky/sky.h
+++ b/sky/sky.h
@@ -30,8 +30,11 @@
#include "sky/sound.h"
#include "sky/text.h"
#include "sky/disk.h"
+#include "sky/struc.h"
#include "sky/skymusic.h"
+class SkyLogic;
+
class SkyState : public Engine {
void errorString(const char *buf_input, char *buf_output);
protected:
@@ -43,8 +46,6 @@ protected:
byte *_tseqData;
uint32 _tseqCounter;
- void *_itemList[300];
-
uint16 _debugMode;
uint16 _debugLevel;
uint16 _language;
@@ -68,6 +69,8 @@ protected:
SkySound *_sound;
SkyDisk *_skyDisk;
+ SkyText *_skyText;
+ SkyLogic *_skyLogic;
SkyMusic *_music;
byte *_workScreen;
@@ -86,8 +89,13 @@ public:
static bool isDemo(uint32 version);
static bool isCDVersion(uint32 version);
+
+ static Compact *fetchCompact(uint32 a);
+ static void **_itemList[300];
+
protected:
+ void logic_engine();
void delay(uint amount);
void pollMouseXY();
void go();
@@ -117,7 +125,6 @@ protected:
void shutdown();
RandomSource _rnd;
- SkyText *_skyText;
};
#endif