cpp/openttd-patchpack/source File Diff

File diff r23482:de566f8c088d → r23483:3733e6b8ff17

src/base_media_func.h

➞

Show inline comments

@@ @@ -277,7 +277,6 @@ template <class Tbase_set> @@
 	return p;
+}
 #if defined(ENABLE_NETWORK)
 #include "network/network_content.h"
 template <class Tbase_set> const char *TryGetBaseSetFile(const ContentInfo *ci, bool md5sum, const Tbase_set *s)
@@ @@ -307,22 +306,6 @@ template <class Tbase_set> @@
 			(TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::duplicate_sets) != NULL);
+}
 #else
 template <class Tbase_set>
 const char *TryGetBaseSetFile(const ContentInfo *ci, bool md5sum, const Tbase_set *s)
+{
 	return NULL;
+}
 template <class Tbase_set>
 /* static */ bool BaseMedia<Tbase_set>::HasSet(const ContentInfo *ci, bool md5sum)
+{
 	return false;
+}
 #endif /* ENABLE_NETWORK */
 /**
  * Count the number of available graphics sets.
  * @return the number of sets