summaryrefslogtreecommitdiff
path: root/src/music.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-02-22 16:24:23 +0000
committerrubidium <rubidium@openttd.org>2010-02-22 16:24:23 +0000
commit03e5434e63305fa66cbd6460f584c2dd99cdb128 (patch)
treedaa94b4c2147626dd1ab275f61ad1badd971a7fb /src/music.cpp
parentdd7c2b2f9db8b2ca2339d43fcf7b0f6da46e8c96 (diff)
downloadopenttd-03e5434e63305fa66cbd6460f584c2dd99cdb128.tar.xz
(svn r19206) -Add: concept of fallback base sets, i.e. do not automatically load the NoMusic/NoSound sets when there is another set
Diffstat (limited to 'src/music.cpp')
-rw-r--r--src/music.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/music.cpp b/src/music.cpp
index e902f4b80..7ba0f23e7 100644
--- a/src/music.cpp
+++ b/src/music.cpp
@@ -45,6 +45,7 @@ template <class Tbase_set>
if (c->GetNumMissing() != 0) continue;
if (best == NULL ||
+ (best->fallback && !c->fallback) ||
best->valid_files < c->valid_files ||
(best->valid_files == c->valid_files &&
(best->shortname == c->shortname && best->version < c->version))) {