[Scummvm-git-logs] scummvm master -> 93e18ba7c38f2a700a66dca91dd147748f2dc161

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
93e18ba7c3 TITANIC: DE: Translation for .avi files directly referred to


Commit: 93e18ba7c38f2a700a66dca91dd147748f2dc161
    https://github.com/scummvm/scummvm/commit/93e18ba7c38f2a700a66dca91dd147748f2dc161
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-10-02T21:40:46-04:00

Commit Message:
TITANIC: DE: Translation for .avi files directly referred to

Changed paths:
    engines/titanic/npcs/parrot.cpp
    engines/titanic/support/avi_surface.cpp


diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp
index c34882c..e322b81 100644
--- a/engines/titanic/npcs/parrot.cpp
+++ b/engines/titanic/npcs/parrot.cpp
@@ -278,7 +278,7 @@ bool CParrot::MovieEndMsg(CMovieEndMsg *msg) {
 
 		if (_takeOff) {
 			// Perch has been taken, so take off
-			loadMovie("z168.avi", false);
+			loadMovie(TRANSLATE("z168.avi", "z191.avi"), false);
 			playClip("Take Off", MOVIE_NOTIFY_OBJECT);
 			setPosition(Point(20, 10));
 			_npcFlags |= NPCFLAG_TAKE_OFF;
@@ -711,7 +711,7 @@ bool CParrot::PanningAwayFromParrotMsg(CPanningAwayFromParrotMsg *msg) {
 		_panTarget = nullptr;
 	} else if (_takeOff) {
 		_panTarget = msg->_target;
-		loadMovie("z168.avi", false);
+		loadMovie(TRANSLATE("z168.avi", "z191.avi"), false);
 		stopMovie();
 		playClip("Take Off", MOVIE_NOTIFY_OBJECT);
 		_npcFlags |= NPCFLAG_TAKE_OFF;
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 4b60921..4fad654 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -29,6 +29,7 @@
 #include "graphics/pixelformat.h"
 #include "graphics/screen.h"
 #include "video/avi_decoder.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -57,7 +58,7 @@ AVISurface::AVISurface(const CResourceKey &key) : _movieName(key.getString()) {
 	_decoder = new AVIDecoder();
 
 	// Load the video into it
-	if (_movieName == "y222.avi") {
+	if (_movieName == TRANSLATE("y222.avi", "y237.avi")) {
 		// The y222.avi is the bells animation for the music room.
 		// It needs on the fly fixing for the video header
 		_decoder->loadStream(new y222());
@@ -547,7 +548,7 @@ uint AVISurface::getBitDepth() const {
 
 y222::y222() {
 	_innerStream = new File();
-	_innerStream->open("y222.avi");
+	_innerStream->open(TRANSLATE("y222.avi", "y237.avi"));
 }
 
 y222::~y222() {