cpp/openttd-patchpack/source File Diff

File diff r14624:f0f6d8556d19 → r14625:3de0713d85fd

src/base_media_func.h

➞

Show inline comments

@@ @@ -30,7 +30,7 @@ template <class Tbase_set> /* static */ @@
+	}
 template <class T, size_t Tnum_files, Subdirectory Tsubdir>
 bool BaseSet<T, Tnum_files, Tsubdir>::FillSetDetails(IniFile *ini, const char *path)
+bool BaseSet<T, Tnum_files, Tsubdir>::FillSetDetails(IniFile *ini, const char *path, bool allow_empty_filename)
+{
 	memset(this, 0, sizeof(*this));
@@ @@ -69,7 +69,7 @@ bool BaseSet<T, Tnum_files, Tsubdir>::Fi @@
 		MD5File *file = &this->files[i];
 		/* Find the filename first. */
 		item = files->GetItem(BaseSet<T, Tnum_files, Tsubdir>::file_names[i], false);
 		if (item == NULL) {
+		if (item == NULL || (item->value == NULL && !allow_empty_filename)) {
 			DEBUG(grf, 0, "No " SET_TYPE " file for: %s", BaseSet<T, Tnum_files, Tsubdir>::file_names[i]);
 			return false;
+		}