[Scummvm-cvs-logs] scummvm master -> 2a2e0377f365cc417a61a5f031e38a0b09114616
bluegr
md5 at scummvm.org
Wed Oct 5 12:09:00 CEST 2011
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:
2a2e0377f3 SCUMM: Code formatting
Commit: 2a2e0377f365cc417a61a5f031e38a0b09114616
https://github.com/scummvm/scummvm/commit/2a2e0377f365cc417a61a5f031e38a0b09114616
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-10-05T03:02:01-07:00
Commit Message:
SCUMM: Code formatting
Changed paths:
engines/scumm/detection.cpp
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 47b461f..75668df 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -314,7 +314,6 @@ static void closeDiskImage(ScummDiskImage *img) {
*/
static bool detectSpeech(const Common::FSList &fslist, const GameSettings *gs) {
if (gs->id == GID_MONKEY || gs->id == GID_MONKEY2) {
-
// FMTOWNS monkey and monkey2 games don't have speech but may have .sou files
if (gs->platform == Common::kPlatformFMTowns)
return false;
@@ -332,16 +331,16 @@ static bool detectSpeech(const Common::FSList &fslist, const GameSettings *gs) {
#endif
0 };
- for (Common::FSList::const_iterator file = fslist.begin();
- file != fslist.end(); ++file) {
- if (!file->isDirectory()) {
- for (int i = 0; basenames[i]; ++i) {
- for (int j = 0; extensions[j]; ++j) {
- Common::String filename = Common::String(basenames[i])
- + "." + Common::String(extensions[j]);
- if (filename.equalsIgnoreCase(file->getName()))
- return true;
- }
+ for (Common::FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
+ if (file->isDirectory())
+ continue;
+
+ for (int i = 0; basenames[i]; ++i) {
+ Common::String basename = Common::String(basenames[i]) + ".";
+
+ for (int j = 0; extensions[j]; ++j) {
+ if ((basename + extensions[j]).equalsIgnoreCase(file->getName()))
+ return true;
}
}
}
More information about the Scummvm-git-logs
mailing list