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

[sev-]

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

Summary:
8703e51086 WINTERMUTE: Let current renderer create surface for theora player
a94849abc4 WINTERMUTE: Change to backward slashes when looking for file in package


Commit: 8703e510869bd1a9925b82a18854178cfac391f0
    https://github.com/scummvm/scummvm/commit/8703e510869bd1a9925b82a18854178cfac391f0
Author: Gunnar Birke (gunnar.birke at online.de)
Date: 2020-06-24T01:44:56+02:00

Commit Message:
WINTERMUTE: Let current renderer create surface for theora player

Changed paths:
    engines/wintermute/video/video_theora_player.cpp


diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index c1c42638f9..bfd1690eea 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -30,7 +30,7 @@
 #include "engines/wintermute/video/video_theora_player.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/base_file_manager.h"
-#include "engines/wintermute/base/gfx/osystem/base_surface_osystem.h"
+#include "engines/wintermute/base/gfx/base_surface.h"
 #include "engines/wintermute/base/gfx/base_image.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/sound/base_sound_manager.h"
@@ -143,7 +143,7 @@ bool VideoTheoraPlayer::initialize(const Common::String &filename, const Common:
 
 	// Additional setup.
 	_surface.create(_theoraDecoder->getWidth(), _theoraDecoder->getHeight(), _theoraDecoder->getPixelFormat());
-	_texture = new BaseSurfaceOSystem(_gameRef);
+	_texture = _gameRef->_renderer->createSurface();
 	_texture->create(_theoraDecoder->getWidth(), _theoraDecoder->getHeight());
 	_state = THEORA_STATE_PLAYING;
 	_playZoom = 100;


Commit: a94849abc4d35f696a0322792ae5f9e3ccd6249b
    https://github.com/scummvm/scummvm/commit/a94849abc4d35f696a0322792ae5f9e3ccd6249b
Author: Gunnar Birke (gunnar.birke at online.de)
Date: 2020-06-24T01:44:56+02:00

Commit Message:
WINTERMUTE: Change to backward slashes when looking for file in package

Changed paths:
    engines/wintermute/base/base_file_manager.cpp


diff --git a/engines/wintermute/base/base_file_manager.cpp b/engines/wintermute/base/base_file_manager.cpp
index f99977a31e..1c12e38eb1 100644
--- a/engines/wintermute/base/base_file_manager.cpp
+++ b/engines/wintermute/base/base_file_manager.cpp
@@ -34,6 +34,7 @@
 #include "engines/wintermute/base/file/base_package.h"
 #include "engines/wintermute/base/base_engine.h"
 #include "engines/wintermute/wintermute.h"
+#include "common/algorithm.h"
 #include "common/debug.h"
 #include "common/str.h"
 #include "common/tokenizer.h"
@@ -372,6 +373,10 @@ uint32 BaseFileManager::getPackageVersion(const Common::String &filename) {
 
 //////////////////////////////////////////////////////////////////////////
 bool BaseFileManager::hasFile(const Common::String &filename) {
+	Common::String backwardSlashesPath = filename;
+	// correct slashes
+	Common::replace(backwardSlashesPath.begin(), backwardSlashesPath.end(), '/', '\\');
+
 	if (scumm_strnicmp(filename.c_str(), "savegame:", 9) == 0) {
 		BasePersistenceManager pm(BaseEngine::instance().getGameTargetName());
 		if (filename.size() <= 9) {
@@ -386,7 +391,7 @@ bool BaseFileManager::hasFile(const Common::String &filename) {
 	if (diskFileExists(filename)) {
 		return true;
 	}
-	if (_packages.hasFile(filename)) {
+	if (_packages.hasFile(backwardSlashesPath)) {
 		return true;    // We don't bother checking if the file can actually be opened, something bigger is wrong if that is the case.
 	}
 	if (!_detectionMode && _resources->hasFile(filename)) {