From 805a5b2996ea331b4503b40e70ff85609a0f0883 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 9 Feb 2011 00:12:58 +0000
Subject: VIDEO: In overloaded methods, invoke correct parent implementation

This should not cause any code behavior changes at this time, but if any
of the intermediate VideoDecoder classes ever starts to overload stuff,
this would become important.

svn-id: r55841
---
 engines/sword1/animation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/sword1')

diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 7dab38b500..de35b8122c 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -77,8 +77,8 @@ MoviePlayer::MoviePlayer(SwordEngine *vm, Text *textMan, Audio::Mixer *snd, OSys
 }
 
 MoviePlayer::~MoviePlayer() {
-	delete _decoder;
 	delete _bgSoundHandle;
+	delete _decoder;
 }
 
 /**
@@ -318,7 +318,7 @@ uint32 DXADecoderWithSound::getElapsedTime() const {
 	if (_mixer->isSoundHandleActive(*_bgSoundHandle))
 		return _mixer->getSoundElapsedTime(*_bgSoundHandle);
 
-	return VideoDecoder::getElapsedTime();
+	return DXADecoder::getElapsedTime();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3