[Scummvm-git-logs] scummvm master -> dfa76112b75dc62481cd7bfab43af3c0b317eee3

[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:
dfa76112b7 XEEN: Fix reaper cutscene rendering


Commit: dfa76112b75dc62481cd7bfab43af3c0b317eee3
    https://github.com/scummvm/scummvm/commit/dfa76112b75dc62481cd7bfab43af3c0b317eee3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-01-20T19:41:42-05:00

Commit Message:
XEEN: Fix reaper cutscene rendering

Changed paths:
    engines/xeen/files.cpp
    engines/xeen/locations.cpp


diff --git a/engines/xeen/files.cpp b/engines/xeen/files.cpp
index d8d5448..86fb3fc 100644
--- a/engines/xeen/files.cpp
+++ b/engines/xeen/files.cpp
@@ -301,7 +301,7 @@ bool File::open(const Common::String &filename, int ccMode) {
 	int oldMode = files._isDarkCc ? 1 : 0;
 
 	files.setGameCc(ccMode);
-	File::open(filename);
+	File::open(filename, *_currentArchive);
 	files.setGameCc(oldMode);
 
 	return true;
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index 647eeba..dbfd437 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -1282,8 +1282,8 @@ int ReaperCutscene::show() {
 	Sound &sound = *g_vm->_sound;
 	Windows &windows = *g_vm->_windows;
 
-	SpriteResource sprites1(_isDarkCc ? "tower1.zom" : "tower.vga");
-	SpriteResource sprites2(_isDarkCc ? "tower2.zom" : "freap.vga");
+	SpriteResource sprites1(_isDarkCc ? "tower1.zom" : "tower.vga", _isDarkCc);
+	SpriteResource sprites2(_isDarkCc ? "tower2.zom" : "freap.vga", _isDarkCc);
 
 	Graphics::ManagedSurface savedBg;
 	savedBg.copyFrom(screen);