(svn r19206) -Add: concept of fallback base sets, i.e. do not automatically load the NoMusic/NoSound sets when there is another set

2010-02-22 16:24:23 +00:00
parent dd7c2b2f9d
commit 03e5434e63
6 changed files with 8 additions and 0 deletions
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -301,6 +301,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))) {