From 8324f6a383b90ff155de1a96a902eeef64f1f9c7 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Wed, 21 Dec 2016 21:59:05 +0100
Subject: [PATCH] Fix crashes, import some ride measurements

---
 src/peep/peep.c         |  5 +++++
 src/rct1/S4Importer.cpp | 45 ++++++++++++++++++++++++++++++++---------
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/peep/peep.c b/src/peep/peep.c
index 0d71d5ba57..e1b1813dfe 100644
--- a/src/peep/peep.c
+++ b/src/peep/peep.c
@@ -6154,6 +6154,11 @@ static int peep_update_patrolling_find_watering(rct_peep* peep){
 
 		rct_map_element* map_element = map_get_first_element_at(x / 32, y / 32);
 
+		// This seems to happen in some SV4 files.
+		if (map_element == NULL) {
+			continue;
+		}
+
 		do {
 			if (map_element_get_type(map_element) != MAP_ELEMENT_TYPE_SCENERY){
 				continue;
diff --git a/src/rct1/S4Importer.cpp b/src/rct1/S4Importer.cpp
index 675346eb9b..954a328e30 100644
--- a/src/rct1/S4Importer.cpp
+++ b/src/rct1/S4Importer.cpp
@@ -569,10 +569,11 @@ private:
         dst->status = RIDE_STATUS_CLOSED;
 
         // Flags
-        if (src->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO)        dst->lifecycle_flags |= RIDE_LIFECYCLE_ON_RIDE_PHOTO;
-        if (src->lifecycle_flags & RIDE_LIFECYCLE_MUSIC)                dst->lifecycle_flags |= RIDE_LIFECYCLE_MUSIC;
-        if (src->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE)       dst->lifecycle_flags |= RIDE_LIFECYCLE_INDESTRUCTIBLE;
-        if (src->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK) dst->lifecycle_flags |= RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK;
+//        if (src->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO)        dst->lifecycle_flags |= RIDE_LIFECYCLE_ON_RIDE_PHOTO;
+//        if (src->lifecycle_flags & RIDE_LIFECYCLE_MUSIC)                dst->lifecycle_flags |= RIDE_LIFECYCLE_MUSIC;
+//        if (src->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE)       dst->lifecycle_flags |= RIDE_LIFECYCLE_INDESTRUCTIBLE;
+//        if (src->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK) dst->lifecycle_flags |= RIDE_LIFECYCLE_INDESTRUCTIBLE_TRACK;
+        dst->lifecycle_flags = src->lifecycle_flags;
 
         // Station
         dst->overall_view = src->overall_view;
@@ -687,6 +688,24 @@ private:
         dst->unreliability_factor = src->unreliability_factor;
         dst->breakdown_reason = src->breakdown_reason;
 
+        // Measurement data
+        dst->excitement = src->excitement;
+        dst->intensity = src->intensity;
+        dst->nausea = src->nausea;
+
+        dst->max_speed = src->max_speed;
+        dst->average_speed = src->average_speed;
+        for (int i = 0; i < 4; i++) {
+            dst->time[i] = src->time[i];
+            dst->length[i] = src->length[i];
+        }
+        dst->max_positive_vertical_g = src->max_positive_vertical_g;
+        dst->max_negative_vertical_g = src->max_negative_vertical_g;
+        dst->max_lateral_g = src->max_lateral_g;
+        dst->drops = src->num_drops;
+        dst->highest_drop_height = src->highest_drop_height / 2;
+        dst->inversions = src->num_inversions;
+
         // Finance
         dst->upkeep_cost = src->upkeep_cost;
         dst->price = src->price;
@@ -772,12 +791,20 @@ private:
         dst->name_string_idx = src->name_string_idx;
 
         dst->outside_of_park = src->outside_of_park;
-        if (src->state != PEEP_STATE_ON_RIDE) {
-            dst->state = src->state;
-        } else {
-            dst->state = PEEP_STATE_FALLING;
-            peep_autoposition(dst);
+
+        // We cannot yet import peeps that are on a ride properly. Move these to a safe place.
+        switch(src->state) {
+            case PEEP_STATE_ON_RIDE:
+            case PEEP_STATE_QUEUING_FRONT:
+            case PEEP_STATE_LEAVING_RIDE:
+            case PEEP_STATE_ENTERING_RIDE:
+                dst->state = PEEP_STATE_FALLING;
+                peep_autoposition(dst);
+                break;
+            default:
+                dst->state = src->state;
         }
+
         dst->type = src->type;
 
         dst->tshirt_colour = RCT1::GetColour(src->tshirt_colour);