diff options
author | David Corrales | 2007-08-05 19:34:20 +0000 |
---|---|---|
committer | David Corrales | 2007-08-05 19:34:20 +0000 |
commit | 6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch) | |
tree | b81a2234c2beff0312c93e039d6cafda4babeca6 /engines/kyra/kyra_v3.h | |
parent | 1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff) | |
parent | ec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff) | |
download | scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2 scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip |
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/kyra/kyra_v3.h')
-rw-r--r-- | engines/kyra/kyra_v3.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/kyra/kyra_v3.h b/engines/kyra/kyra_v3.h index eda382d89a..f9b81b5126 100644 --- a/engines/kyra/kyra_v3.h +++ b/engines/kyra/kyra_v3.h @@ -26,20 +26,17 @@ #ifndef KYRA_KYRA_V3_H #define KYRA_KYRA_V3_H -#include "kyra/kyra.h" +#include "kyra/kyra_v2.h" namespace Kyra { -// maybe subclass KyraEngine_v2 later -class WSAMovieV2; +class SoundDigital; -class KyraEngine_v3 : public KyraEngine { +class KyraEngine_v3 : public KyraEngine_v2 { public: KyraEngine_v3(OSystem *system, const GameFlags &flags); ~KyraEngine_v3(); - - Movie *createWSAMovie(); - + SoundDigital *soundDigital() { return _soundDigital; } int go(); |