From 996cbdec023bc0c3aa6a7316324f6a0bcf1e823c Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Wed, 31 Jul 2019 20:12:24 +0100 Subject: [PATCH] Correctly input num_holes, inversions --- src/openrct2/rct1/T4Importer.cpp | 11 ++++++++--- src/openrct2/rct2/T6Importer.cpp | 12 +++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/openrct2/rct1/T4Importer.cpp b/src/openrct2/rct1/T4Importer.cpp index 2d151f8e73..7d7799662c 100644 --- a/src/openrct2/rct1/T4Importer.cpp +++ b/src/openrct2/rct1/T4Importer.cpp @@ -230,9 +230,14 @@ private: td->max_negative_vertical_g = td4Base.max_negative_vertical_g; td->max_lateral_g = td4Base.max_lateral_g; - // Only one sort this out - td->inversions = td4Base.num_inversions; - td->holes = td4Base.num_holes; + if (td->type == RIDE_TYPE_MINI_GOLF) + { + td->holes = td4Base.num_holes; + } + else + { + td->inversions = td4Base.num_inversions; + } td->drops = td4Base.num_drops; td->highest_drop_height = td4Base.highest_drop_height / 2; diff --git a/src/openrct2/rct2/T6Importer.cpp b/src/openrct2/rct2/T6Importer.cpp index eebee3b2f2..64bdba83cf 100644 --- a/src/openrct2/rct2/T6Importer.cpp +++ b/src/openrct2/rct2/T6Importer.cpp @@ -98,9 +98,15 @@ public: td->max_positive_vertical_g = td6.max_positive_vertical_g; td->max_negative_vertical_g = td6.max_negative_vertical_g; td->max_lateral_g = td6.max_lateral_g; - // Only one sort this out - td->inversions = td6.inversions; - td->holes = td6.holes; + + if (td->type == RIDE_TYPE_MINI_GOLF) + { + td->holes = td6.holes; + } + else + { + td->inversions = td6.inversions; + } td->drops = td6.drops; td->highest_drop_height = td6.highest_drop_height;