MOHAWK: Fix some clang-tidy warnings

1 files changed, 21 insertions, 19 deletions

diff --git a/engines/mohawk/riven_graphics.cpp b/engines/mohawk/riven_graphics.cpp
index d0a5c05636..d4ea8fc703 100644
--- a/engines/mohawk/riven_graphics.cpp
+++ b/engines/mohawk/riven_graphics.cpp
@@ -101,7 +101,7 @@ public:
 		_lastCopyArea = makeDirectionalInitalArea();
 	}
 
-	virtual bool drawFrame(uint32 elapsed) override {
+	bool drawFrame(uint32 elapsed) override {
 		Common::Rect copyArea;
 		switch (_type) {
 			case kRivenTransitionWipeLeft:
@@ -162,7 +162,7 @@ public:
 		 complete = false;
 	}
 
-	virtual bool drawFrame(uint32 elapsed) override {
+	bool drawFrame(uint32 elapsed) override {
 		Common::Rect newArea;
 		switch (_type) {
 			case kRivenTransitionPanLeft:
@@ -264,7 +264,7 @@ public:
 		_timeBased = false;
 	}
 
-	virtual bool drawFrame(uint32 elapsed) override {
+	bool drawFrame(uint32 elapsed) override {
 		assert(_effectScreen->format == _mainScreen->format);
 		assert(_effectScreen->format == _system->getScreenFormat());
 
@@ -303,7 +303,22 @@ public:
 	}
 };
 
-RivenGraphics::RivenGraphics(MohawkEngine_Riven* vm) : GraphicsManager(), _vm(vm) {
+RivenGraphics::RivenGraphics(MohawkEngine_Riven* vm) :
+		GraphicsManager(),
+		_vm(vm),
+		_screenUpdateNesting(0),
+		_screenUpdateRunning(false),
+		_enableCardUpdateScript(true),
+		_scheduledTransition(kRivenTransitionNone),
+		_dirtyScreen(false),
+		_creditsImage(302),
+		_creditsPos(0),
+		_transitionMode(kRivenTransitionModeFastest),
+		_transitionOffset(-1),
+		_waterEffect(nullptr),
+		_fliesEffect(nullptr),
+		_transitionFrames(0),
+		_transitionDuration(0) {
 	_bitmapDecoder = new MohawkBitmap();
 
 	// Restrict ourselves to a single pixel format to simplify the effects implementation
@@ -317,20 +332,6 @@ RivenGraphics::RivenGraphics(MohawkEngine_Riven* vm) : GraphicsManager(), _vm(vm
 
 	_effectScreen = new Graphics::Surface();
 	_effectScreen->create(608, 392, _pixelFormat);
-
-	_screenUpdateNesting = 0;
-	_screenUpdateRunning = false;
-	_enableCardUpdateScript = true;
-	_scheduledTransition = kRivenTransitionNone;
-	_dirtyScreen = false;
-
-	_creditsImage = 302;
-	_creditsPos = 0;
-
-	_transitionMode = kRivenTransitionModeFastest;
-	_transitionOffset = -1;
-	_waterEffect = nullptr;
-	_fliesEffect = nullptr;
 }
 
 RivenGraphics::~RivenGraphics() {
@@ -339,7 +340,8 @@ RivenGraphics::~RivenGraphics() {
 	_mainScreen->free();
 	delete _mainScreen;
 	delete _bitmapDecoder;
-	delete _fliesEffect;
+	clearFliesEffect();
+	clearWaterEffect();
 }
 
 MohawkSurface *RivenGraphics::decodeImage(uint16 id) {