diff options
| author | Jamieson Christian | 2003-08-15 10:19:24 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-08-15 10:19:24 +0000 |
| commit | e1bc6493d858f569716cf2036732e8a1ddf36573 (patch) | |
| tree | b8549f630011dcab1b4c684a22daba09b96119b2 /sword2 | |
| parent | f9aea7673ffcbb515e2a3ed32108b00f60598414 (diff) | |
| download | scummvm-rg350-e1bc6493d858f569716cf2036732e8a1ddf36573.tar.gz scummvm-rg350-e1bc6493d858f569716cf2036732e8a1ddf36573.tar.bz2 scummvm-rg350-e1bc6493d858f569716cf2036732e8a1ddf36573.zip | |
Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible
list of music types supported. This was done because now
PC speaker support must be treated separately, along with
Adlib and native (GM/MT32) support.
This fixes a problem with games that don't support PC speaker
(including V5 games that don't parse SPK resources yet)
being run with -epcspk or -epcjr. Those games now properly
switch to -enull so that music resources still get parsed
and music/script synchronization mechanisms don't break.
svn-id: r9703
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/sword2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sword2/sword2.cpp b/sword2/sword2.cpp index bbc522f37a..ffe30eae01 100644 --- a/sword2/sword2.cpp +++ b/sword2/sword2.cpp @@ -84,9 +84,9 @@ uint8 stepOneCycle=0; // for use while game paused static const VersionSettings sword2_settings[] = { /* Broken Sword 2 */ - {"sword2", "Broken Sword II", GID_SWORD2, 99, VersionSettings::ADLIB_DONT_CARE, GF_DEFAULT_TO_1X_SCALER, "players.clu" }, - {"sword2demo", "Broken Sword II (Demo)", GID_SWORD2_DEMO, 99, VersionSettings::ADLIB_DONT_CARE, GF_DEFAULT_TO_1X_SCALER, "players.clu" }, - {NULL, NULL, 0, 0, VersionSettings::ADLIB_DONT_CARE, 0, NULL} + {"sword2", "Broken Sword II", GID_SWORD2, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "players.clu" }, + {"sword2demo", "Broken Sword II (Demo)", GID_SWORD2_DEMO, 99, MDT_ADLIB | MDT_NATIVE, GF_DEFAULT_TO_1X_SCALER, "players.clu" }, + {NULL, NULL, 0, 0, MDT_NONE, 0, NULL} }; Sword2State *g_sword2 = NULL; |