# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2010-02-22 16:24:23
# Node ID fff04644c054245880183c681a89de842eb77fbb
# Parent  a194334b4a3a282846bde48fe2c1d18fd1913fd2

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

diff --git a/bin/gm/no_music.obm b/bin/gm/no_music.obm
--- a/bin/gm/no_music.obm
+++ b/bin/gm/no_music.obm
@@ -6,6 +6,7 @@
 name              = NoMusic
 shortname         = NOMU
 version           = 0
+fallback          = true
 description       = A music pack without actual music.
 description.cs_CZ = Prázná hudební sada.
 description.de_DE = Ein Musikset ohne Musik.
diff --git a/src/base_media_base.h b/src/base_media_base.h
--- a/src/base_media_base.h
+++ b/src/base_media_base.h
@@ -59,6 +59,7 @@ struct BaseSet {
 	TranslatedStrings description; ///< Description of the base set
 	uint32 shortname;              ///< Four letter short variant of the name
 	uint32 version;                ///< The version of this base set
+	bool fallback;                 ///< This set is a fallback set, i.e. it should be used only as last resort
 
 	MD5File files[NUM_FILES];      ///< All files part of this set
 	uint found_files;              ///< Number of the files that could be found
diff --git a/src/base_media_func.h b/src/base_media_func.h
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -58,6 +58,9 @@ bool BaseSet<T, Tnum_files, Tsubdir>::Fi
 	fetch_metadata("version");
 	this->version = atoi(item->value);
 
+	item = metadata->GetItem("fallback", false);
+	this->fallback = (item != NULL && strcmp(item->value, "0") != 0 && strcmp(item->value, "false") != 0);
+
 	/* For each of the file types we want to find the file, MD5 checksums and warning messages. */
 	IniGroup *files  = ini->GetGroup("files");
 	IniGroup *md5s   = ini->GetGroup("md5s");
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -296,6 +296,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) ||
diff --git a/src/music.cpp b/src/music.cpp
--- 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))) {
diff --git a/src/sound.cpp b/src/sound.cpp
--- 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))) {