diff options
author | Johannes Schickel | 2007-01-29 18:15:14 +0000 |
---|---|---|
committer | Johannes Schickel | 2007-01-29 18:15:14 +0000 |
commit | 1bbad356ef66a72951a58be7f1c328ba3c6d501f (patch) | |
tree | cc38ad4aff03763b58daaab7400e29a0f73b39e6 /engines/kyra/kyra.h | |
parent | 0058049e3224b10d1d8a074d70eb092a9a780fd3 (diff) | |
download | scummvm-rg350-1bbad356ef66a72951a58be7f1c328ba3c6d501f.tar.gz scummvm-rg350-1bbad356ef66a72951a58be7f1c328ba3c6d501f.tar.bz2 scummvm-rg350-1bbad356ef66a72951a58be7f1c328ba3c6d501f.zip |
- adds support for FM-Towns SFX (thanks to Florian Kagerer for his source)
- gets rid of GameFlags::hasAudioCD
svn-id: r25258
Diffstat (limited to 'engines/kyra/kyra.h')
-rw-r--r-- | engines/kyra/kyra.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/engines/kyra/kyra.h b/engines/kyra/kyra.h index bfe406b65b..5c54a34c41 100644 --- a/engines/kyra/kyra.h +++ b/engines/kyra/kyra.h @@ -51,7 +51,6 @@ struct GameFlags { Common::Platform platform; bool isDemo; bool useAltShapeHeader; // alternative shape header (uses 2 bytes more, those are unused though) - bool hasAudioCD; bool isTalkie; byte gameID; }; @@ -238,10 +237,6 @@ class KyraEngine : public Engine { friend class Debugger; friend class ScreenAnimator; public: - enum { - MUSIC_INTRO = 0 - }; - KyraEngine(OSystem *system, const GameFlags &flags); virtual ~KyraEngine(); @@ -805,7 +800,7 @@ protected: uint8 _configVoice; int _curMusicTheme; - int _newMusicTheme; + int _curSfxFile; int16 _lastMusicCommand; Resource *_res; @@ -974,9 +969,12 @@ protected: const uint8 * const*_specialPalettes; Timer _timers[34]; - uint32 _timerNextRun; - static const char *_musicFiles[]; - static const int _musicFilesCount; + uint32 _timerNextRun; + + static const char *_soundFiles[]; + static const int _soundFilesCount; + static const char *_soundFilesTowns[]; + static const int _soundFilesTownsCount; static const int8 _charXPosTable[]; static const int8 _addXPosTable[]; |