diff options
author | James Brown | 2004-10-15 06:06:47 +0000 |
---|---|---|
committer | James Brown | 2004-10-15 06:06:47 +0000 |
commit | 8f65711a28b0cdedca29cdd1787b40546d448575 (patch) | |
tree | feafc61c0bdbd529ef1eb52acf743033395f3547 /kyra/kyra.h | |
parent | 9e40ef7d29ccaca45708b39e1da92bbca088d6ac (diff) | |
download | scummvm-rg350-8f65711a28b0cdedca29cdd1787b40546d448575.tar.gz scummvm-rg350-8f65711a28b0cdedca29cdd1787b40546d448575.tar.bz2 scummvm-rg350-8f65711a28b0cdedca29cdd1787b40546d448575.zip |
Merge in some of LordHotos kyra code, with some changes.
It's still non-functional, but once I merge in some more of my local changes things should actually be moving a long a bit.
svn-id: r15554
Diffstat (limited to 'kyra/kyra.h')
-rw-r--r-- | kyra/kyra.h | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/kyra/kyra.h b/kyra/kyra.h index 9bcf09e3c4..14a5c7855e 100644 --- a/kyra/kyra.h +++ b/kyra/kyra.h @@ -22,26 +22,49 @@ #ifndef KYRA_H #define KYRA_H -#include "common/scummsys.h" +//#include "common/scummsys.h" #include "base/engine.h" #include "base/gameDetector.h" #include "common/util.h" +enum { + GF_FLOPPY = 1 << 0, + GF_TALKIE = 1 << 1, + GF_KYRA1 = 1 << 2, + GF_KYRA2 = 1 << 3 +}; + namespace Kyra { + class Resourcemanager; + class CPSImage; + class Font; + class Palette; + class VMContext; class KyraEngine : public Engine { - +public: + KyraEngine(GameDetector *detector, OSystem *syst); + ~KyraEngine(); void errorString( const char *buf_input, char *buf_output); + void updateScreen(void); + void setCurrentPalette(Palette* pal, bool delNextTime = true); + + Resourcemanager* resManager(void) { return _resMgr; } +// MidiDriver* midiDriver(void) { return _midiDriver; } + protected: void go(); void shutdown(); + Resourcemanager* _resMgr; + uint8 *_screen; -public: - - KyraEngine(GameDetector *detector, OSystem *syst); - virtual ~KyraEngine(); + Font* _font; + CPSImage* _mouse; + CPSImage* _items; + VMContext* _currentScript; // our current script + VMContext* _npcScript; // script from NPCs }; } // End of namespace Kyra |