[Scummvm-cvs-logs] SF.net SVN: scummvm:[46028] scummvm/trunk/engines/sci/engine/state.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Fri Nov 20 23:39:57 CET 2009
Revision: 46028
http://scummvm.svn.sourceforge.net/scummvm/?rev=46028&view=rev
Author: thebluegr
Date: 2009-11-20 22:39:57 +0000 (Fri, 20 Nov 2009)
Log Message:
-----------
Simplified the doSound detection a bit
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/state.cpp
Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp 2009-11-20 22:38:50 UTC (rev 46027)
+++ scummvm/trunk/engines/sci/engine/state.cpp 2009-11-20 22:39:57 UTC (rev 46028)
@@ -501,15 +501,18 @@
// SCI0 sound code (i.e. SCI_VERSION_0_EARLY)
_doSoundType = SCI_VERSION_0_EARLY;
} else {
- if (!autoDetectFeature(kDetectSoundType)) {
- warning("DoSound detection failed, taking an educated guess");
+ if (getSciVersion() >= SCI_VERSION_1_LATE) {
+ // All SCI1 late games use the newer doSound semantics
+ _doSoundType = SCI_VERSION_1_LATE;
+ } else {
+ if (!autoDetectFeature(kDetectSoundType)) {
+ warning("DoSound detection failed, taking an educated guess");
- if (getSciVersion() >= SCI_VERSION_1_MIDDLE)
- _doSoundType = SCI_VERSION_1_LATE;
- else if (getSciVersion() > SCI_VERSION_01)
- _doSoundType = SCI_VERSION_1_EARLY;
- else
- _doSoundType = SCI_VERSION_0_EARLY;
+ if (getSciVersion() >= SCI_VERSION_1_MIDDLE)
+ _doSoundType = SCI_VERSION_1_LATE;
+ else if (getSciVersion() > SCI_VERSION_01)
+ _doSoundType = SCI_VERSION_1_EARLY;
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list