Merged fsnode with trunk: r27971:28460

svn-id: r28462

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();