[Scummvm-git-logs] scummvm master -> d8dc31a6730dff72189b5ab240a5af06ab5dd135
bluegr
bluegr at gmail.com
Sun Aug 11 17:58:43 CEST 2019
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:
d8dc31a673 WAGE: Don't require the data fork for the external sound file
Commit: d8dc31a6730dff72189b5ab240a5af06ab5dd135
https://github.com/scummvm/scummvm/commit/d8dc31a6730dff72189b5ab240a5af06ab5dd135
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-08-11T18:58:40+03:00
Commit Message:
WAGE: Don't require the data fork for the external sound file
Changed paths:
engines/wage/world.cpp
diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index fa8cfd5..7132070 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -359,17 +359,11 @@ void World::addSound(Sound *sound) {
}
void World::loadExternalSounds(Common::String fname) {
- Common::File in;
-
- in.open(fname);
- if (!in.isOpen()) {
+ Common::MacResManager resMan;
+ if (!resMan.open(fname)) {
warning("Cannot load sound file <%s>", fname.c_str());
return;
}
- in.close();
-
- Common::MacResManager resMan;
- resMan.open(fname);
Common::MacResIDArray resArray;
Common::SeekableReadStream *res;
More information about the Scummvm-git-logs
mailing list