# HG changeset patch
# User frosch <frosch@openttd.org>
# Date 2020-12-14 21:25:07
# Node ID 05e89d8e369be94c376dd4c386f5782c399d983c
# Parent  c13edb82020b495c337f19d2446f4b35f4691d23

Codechange: Apple LLVM fails to implement std::optional::value() also on pretty recent version. Use operator* instead.

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
@@ -55,15 +55,15 @@ bool BaseSet<T, Tnum_files, Tsearch_in_t
 	}
 
 	fetch_metadata("shortname");
-	for (uint i = 0; item->value.value()[i] != '\0' && i < 4; i++) {
-		this->shortname |= ((uint8)item->value.value()[i]) << (i * 8);
+	for (uint i = 0; (*item->value)[i] != '\0' && i < 4; i++) {
+		this->shortname |= ((uint8)(*item->value)[i]) << (i * 8);
 	}
 
 	fetch_metadata("version");
 	this->version = atoi(item->value->c_str());
 
 	item = metadata->GetItem("fallback", false);
-	this->fallback = (item != nullptr && item->value && item->value.value() != "0" && item->value.value() != "false");
+	this->fallback = (item != nullptr && item->value && *item->value != "0" && *item->value != "false");
 
 	/* For each of the file types we want to find the file, MD5 checksums and warning messages. */
 	IniGroup *files  = ini->GetGroup("files");
diff --git a/src/gfxinit.cpp b/src/gfxinit.cpp
--- a/src/gfxinit.cpp
+++ b/src/gfxinit.cpp
@@ -357,11 +357,11 @@ bool GraphicsSet::FillSetDetails(IniFile
 		IniItem *item;
 
 		fetch_metadata("palette");
-		this->palette = (item->value.value()[0] == 'D' || item->value.value()[0] == 'd') ? PAL_DOS : PAL_WINDOWS;
+		this->palette = ((*item->value)[0] == 'D' || (*item->value)[0] == 'd') ? PAL_DOS : PAL_WINDOWS;
 
 		/* Get optional blitter information. */
 		item = metadata->GetItem("blitter", false);
-		this->blitter = (item != nullptr && item->value.value()[0] == '3') ? BLT_32BPP : BLT_8BPP;
+		this->blitter = (item != nullptr && (*item->value)[0] == '3') ? BLT_32BPP : BLT_8BPP;
 	}
 	return ret;
 }