MOHAWK: Allow disabling of Riven compilation

1 files changed, 16 insertions, 12 deletions

diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h
index 08fb4531e8..1331508421 100644
--- a/engines/mohawk/graphics.h
+++ b/engines/mohawk/graphics.h
@@ -39,7 +39,6 @@ namespace Graphics {
 namespace Mohawk {
 
 class MohawkEngine;
-class MohawkEngine_Riven;
 class MohawkEngine_LivingBooks;
 class MohawkBitmap;
 
@@ -162,19 +161,11 @@ private:
 	Common::Rect _viewport;
 };
 
-#endif
+#endif // ENABLE_MYST
 
-struct SFXERecord {
-	// Record values
-	uint16 frameCount;
-	Common::Rect rect;
-	uint16 speed;
-	Common::Array<Common::SeekableReadStream*> frameScripts;
+#ifdef ENABLE_RIVEN
 
-	// Cur frame
-	uint16 curFrame;
-	uint32 lastFrameTime;
-};
+class MohawkEngine_Riven;
 
 class RivenGraphics : public GraphicsManager {
 public:
@@ -218,6 +209,17 @@ private:
 	MohawkBitmap *_bitmapDecoder;
 
 	// Water Effects
+	struct SFXERecord {
+		// Record values
+		uint16 frameCount;
+		Common::Rect rect;
+		uint16 speed;
+		Common::Array<Common::SeekableReadStream*> frameScripts;
+
+		// Cur frame
+		uint16 curFrame;
+		uint32 lastFrameTime;
+	};
 	Common::Array<SFXERecord> _waterEffects;
 
 	// Transitions
@@ -239,6 +241,8 @@ private:
 	uint _creditsImage, _creditsPos;
 };
 
+#endif ENABLE_RIVEN
+
 class LBGraphics : public GraphicsManager {
 public:
 	LBGraphics(MohawkEngine_LivingBooks *vm, uint16 width, uint16 height);