From fc8e0cf9d7fff2ab297255701b3547c170e569c3 Mon Sep 17 00:00:00 2001
From: Hielke Morsink <hielke.morsink@gmail.com>
Date: Thu, 16 Sep 2021 23:05:50 +0200
Subject: [PATCH] A couple more nullopt returns (#15422)

---
 src/openrct2/core/String.hpp          | 2 +-
 src/openrct2/object/ObjectManager.cpp | 2 +-
 src/openrct2/rct12/RCT12.cpp          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/openrct2/core/String.hpp b/src/openrct2/core/String.hpp
index 8c590ee207..82347978b9 100644
--- a/src/openrct2/core/String.hpp
+++ b/src/openrct2/core/String.hpp
@@ -169,7 +169,7 @@ namespace String
         {
             return { 4 };
         }
-        return {};
+        return std::nullopt;
     }
 
     /**
diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp
index 522a9b4963..46eb2f9ea5 100644
--- a/src/openrct2/object/ObjectManager.cpp
+++ b/src/openrct2/object/ObjectManager.cpp
@@ -419,7 +419,7 @@ private:
                 return static_cast<int32_t>(i);
             }
         }
-        return {};
+        return std::nullopt;
     }
 
     size_t GetLoadedObjectIndex(const Object* object)
diff --git a/src/openrct2/rct12/RCT12.cpp b/src/openrct2/rct12/RCT12.cpp
index 560cd73cfd..a371a02f8c 100644
--- a/src/openrct2/rct12/RCT12.cpp
+++ b/src/openrct2/rct12/RCT12.cpp
@@ -1410,5 +1410,5 @@ std::optional<uint8_t> GetStyleFromMusicIdentifier(std::string_view identifier)
     {
         return std::distance(std::begin(_musicStyles), it);
     }
-    return {};
+    return std::nullopt;
 }