libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-06 10:17:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PRIVATE: Migrate engine to Path

Browse Source
This commit is contained in:
Le Philousophe 2023-09-17 18:23:45 +02:00 committed by Eugene Sandulenko
parent d7526ad280
commit 50e4085263
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engines/private/private.cpp
View File

@ -127,7 +127,7 @@ PrivateEngine::~PrivateEngine() {
}
void PrivateEngine::initializePath(const Common::FSNode &gamePath) {
SearchMan.addDirectory(gamePath.getPath(), gamePath, 0, 10);
SearchMan.addDirectory(gamePath, 0, 10);
}
Common::SeekableReadStream *PrivateEngine::loadAssets() {
@ -1172,7 +1172,7 @@ Common::Error PrivateEngine::saveGameStream(Common::WriteStream *stream, bool is
return Common::kNoError;
}
Common::String PrivateEngine::convertPath(const Common::String &name) {
Common::Path PrivateEngine::convertPath(const Common::String &name) {
Common::String path(name);
Common::String s1("\\");
Common::String s2("/");
@ -1187,17 +1187,17 @@ Common::String PrivateEngine::convertPath(const Common::String &name) {
Common::replace(path, s1, s2);
path.toLowercase();
return path;
return Common::Path(path);
}
void PrivateEngine::playSound(const Common::String &name, uint loops, bool stopOthers, bool background) {
debugC(1, kPrivateDebugFunction, "%s(%s,%d,%d,%d)", __FUNCTION__, name.c_str(), loops, stopOthers, background);
Common::String path = convertPath(name);
Common::Path path = convertPath(name);
Common::SeekableReadStream *file = Common::MacResManager::openFileOrDataFork(path);
if (!file)
error("unable to find sound file %s", path.c_str());
error("unable to find sound file %s", path.toString().c_str());
Audio::LoopingAudioStream *stream;
stream = new Audio::LoopingAudioStream(Audio::makeWAVStream(file, DisposeAfterUse::YES), loops);
@ -1224,14 +1224,14 @@ bool PrivateEngine::isSoundActive() {
void PrivateEngine::playVideo(const Common::String &name) {
debugC(1, kPrivateDebugFunction, "%s(%s)", __FUNCTION__, name.c_str());
//stopSound(true);
Common::String path = convertPath(name);
Common::Path path = convertPath(name);
Common::SeekableReadStream *file = Common::MacResManager::openFileOrDataFork(path);
if (!file)
error("unable to find video file %s", path.c_str());
error("unable to find video file %s", path.toString().c_str());
if (!_videoDecoder->loadStream(file))
error("unable to load video %s", path.c_str());
error("unable to load video %s", path.toString().c_str());
_videoDecoder->start();
}
@ -1255,7 +1255,7 @@ void PrivateEngine::stopSound(bool all) {
Graphics::Surface *PrivateEngine::decodeImage(const Common::String &name, byte **palette) {
debugC(1, kPrivateDebugFunction, "%s(%s)", __FUNCTION__, name.c_str());
Common::String path = convertPath(name);
Common::Path path = convertPath(name);
Common::ScopedPtr<Common::SeekableReadStream> file(Common::MacResManager::openFileOrDataFork(path));
if (!file)
error("unable to load image %s", name.c_str());
@ -1268,7 +1268,7 @@ Graphics::Surface *PrivateEngine::decodeImage(const Common::String &name, byte *
byte *currentPalette;
uint16 ncolors = _image->getPaletteColorCount();
if (ncolors < 256 || path.hasPrefix("intro")) { // For some reason, requires color remapping
if (ncolors < 256 || path.toString('/').hasPrefix("intro")) { // For some reason, requires color remapping
currentPalette = (byte *) malloc(3*256);
drawScreen();
g_system->getPaletteManager()->grabPalette(currentPalette, 0, 256);

2
engines/private/private.h
View File

@ -195,7 +195,7 @@ public:
Common::Error saveGameStream(Common::WriteStream *stream, bool isAutosave = false) override;
void syncGameStream(Common::Serializer &s);
Common::String convertPath(const Common::String &);
Common::Path convertPath(const Common::String &);
void playVideo(const Common::String &);
void skipVideo();