3 files changed, 13 insertions, 7 deletions
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 42e3618b97..a1dbecbe1c 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -284,10 +284,13 @@ void AVISurface::copyMovieFrame(const Graphics::Surface &src, Graphics::ManagedS
 
 	if (src.format.bytesPerPixel == 1) {
 		// Paletted 8-bit, so convert to 16-bit and copy over
-		Graphics::Surface *s = src.convertTo(dest.format, _decoder->getPalette());
-		dest.blitFrom(*s, copyRect, Common::Point(0, 0));
-		s->free();
-		delete s;
+		const byte *palette = _decoder->getPalette();
+		if (palette) {
+			Graphics::Surface *s = src.convertTo(dest.format, palette);
+			dest.blitFrom(*s, copyRect, Common::Point(0, 0));
+			s->free();
+			delete s;
+		}
 	} else if (src.format.bytesPerPixel == 2) {
 		// Source is already 16-bit, with no alpha, so do a straight copy
 		dest.blitFrom(src, copyRect, Common::Point(0, 0));
diff --git a/engines/titanic/support/avi_surface.h b/engines/titanic/support/avi_surface.h
index f45db3599e..d3442a12f7 100644
--- a/engines/titanic/support/avi_surface.h
+++ b/engines/titanic/support/avi_surface.h
@@ -34,8 +34,11 @@ class CSoundManager;
 class CVideoSurface;
 
 enum MovieFlag {
-	MOVIE_REPEAT = 1, MOVIE_STOP_PREVIOUS = 2, MOVIE_NOTIFY_OBJECT = 4,
-	MOVIE_REVERSE = 8, MOVIE_GAMESTATE = 0x10
+	MOVIE_REPEAT = 1,				// Repeat movie
+	MOVIE_STOP_PREVIOUS = 2,		// Stop any prior movie playing on the object
+	MOVIE_NOTIFY_OBJECT = 4,		// Notify the object when the movie finishes
+	MOVIE_REVERSE = 8,				// Play the movie in reverse
+	MOVIE_WAIT_FOR_FINISH = 0x10	// Let finish before playing next movie for object
 };
 
 class AVIDecoder : public Video::AVIDecoder {
diff --git a/engines/titanic/support/files_manager.cpp b/engines/titanic/support/files_manager.cpp
index fc09c5702c..cf706974a7 100644
--- a/engines/titanic/support/files_manager.cpp
+++ b/engines/titanic/support/files_manager.cpp
@@ -106,7 +106,7 @@ void CFilesManager::loadDrive() {
 }
 
 void CFilesManager::insertCD(CScreenManager *screenManager) {
-	// We not support running game directly from the original CDs,
+	// We don't support running the game directly from the original CDs,
 	// so this method can remain stubbed
 }