From e080a593378bcaf44a7b44c297dcb291a2b584a8 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 9 Mar 2009 03:45:23 +0000
Subject: Renamed SMKPlayer -> SmackerDecoder and DXAPlayer -> DXADecoder, as
 well as some other tweaks

svn-id: r39255
---
 engines/saga/introproc_saga2.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/saga/introproc_saga2.cpp')

diff --git a/engines/saga/introproc_saga2.cpp b/engines/saga/introproc_saga2.cpp
index 99e0c2cddd..86b9d6de01 100644
--- a/engines/saga/introproc_saga2.cpp
+++ b/engines/saga/introproc_saga2.cpp
@@ -52,10 +52,10 @@ int Scene::DinoStartProc() {
 	stopEvent.kbd = Common::KEYCODE_ESCAPE;
 	stopEvents.push_back(stopEvent);
 
-	Graphics::SMKPlayer *smkDecoder = new Graphics::SMKPlayer(_vm->_mixer);
+	Graphics::SmackerDecoder *smkDecoder = new Graphics::SmackerDecoder(_vm->_mixer);
 	Graphics::VideoPlayer *player = new Graphics::VideoPlayer(smkDecoder);
 	if (smkDecoder->loadFile("testvid.smk"))
-		player->playVideo(&stopEvents);        // Play introduction
+		player->playVideo(stopEvents);        // Play introduction
 	smkDecoder->closeFile();
 	delete player;
 	delete smkDecoder;
@@ -75,13 +75,13 @@ int Scene::FTA2StartProc() {
 	stopEvent.kbd = Common::KEYCODE_ESCAPE;
 	stopEvents.push_back(stopEvent);
 
-	Graphics::SMKPlayer *smkDecoder = new Graphics::SMKPlayer(_vm->_mixer);
+	Graphics::SmackerDecoder *smkDecoder = new Graphics::SmackerDecoder(_vm->_mixer);
 	Graphics::VideoPlayer *player = new Graphics::VideoPlayer(smkDecoder);
 	if (smkDecoder->loadFile("trimark.smk"))
-		player->playVideo(&stopEvents);      // Show Ignite logo
+		player->playVideo(stopEvents);      // Show Ignite logo
 	smkDecoder->closeFile();
 	if (smkDecoder->loadFile("intro.smk"))
-		player->playVideo(&stopEvents);        // Play introduction
+		player->playVideo(stopEvents);        // Play introduction
 	smkDecoder->closeFile();
 	delete player;
 	delete smkDecoder;
@@ -125,10 +125,10 @@ int Scene::FTA2EndProc(FTA2Endings whichEnding) {
 	stopEvents.push_back(stopEvent);
 
 	// Play ending
-	Graphics::SMKPlayer *smkDecoder = new Graphics::SMKPlayer(_vm->_mixer);
+	Graphics::SmackerDecoder *smkDecoder = new Graphics::SmackerDecoder(_vm->_mixer);
 	Graphics::VideoPlayer *player = new Graphics::VideoPlayer(smkDecoder);
 	if (smkDecoder->loadFile(videoName)) {
-		player->playVideo(&stopEvents);
+		player->playVideo(stopEvents);
 		smkDecoder->closeFile();
 	}
 	delete player;
-- 
cgit v1.2.3