Fixed undefined behavior in GetRealSubwayDoor

1 files changed, 3 insertions, 4 deletions

@@ -19,7 +19,6 @@ enum class ItemDrawType { kNone, kBox, kOwl };
 namespace {
 
 std::optional<int> GetRealSubwayDoor(const SubwayItem subway_item) {
-  std::optional<int> subway_door = subway_item.door;
   if (AP_IsSunwarpShuffle() && subway_item.sunwarp &&
       subway_item.sunwarp->type != SubwaySunwarpType::kFinal) {
     int sunwarp_index = subway_item.sunwarp->dots - 1;
@@ -29,12 +28,12 @@ std::optional<int> GetRealSubwayDoor(const SubwayItem subway_item) {
 
     for (const auto &[start_index, mapping] : AP_GetSunwarpMapping()) {
       if (start_index == sunwarp_index || mapping.exit_index == sunwarp_index) {
-        subway_door = GD_GetSunwarpDoors().at(mapping.dots - 1);
+        return GD_GetSunwarpDoors().at(mapping.dots - 1);
       }
     }
-
-    return subway_door;
   }
+
+  return subway_item.door;
 }
 
 }  // namespace