From 5f6ae6ac8c2776c374c944b20d4fcc39b1ce6bdd Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 2 Mar 2019 04:45:47 +0100 Subject: [PATCH 1/4] Fix copying the wrong field. --- src/openrct2/rct2/S6Exporter.cpp | 2 +- src/openrct2/rct2/S6Importer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index cb59affa99..0208cfd9b8 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -962,7 +962,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const rct_peep* src) auto srcThought = &src->thoughts[i]; auto dstThought = &dst->thoughts[i]; dstThought->type = (uint8_t)srcThought->type; - dstThought->item = srcThought->type; + dstThought->item = srcThought->item; dstThought->freshness = srcThought->freshness; dstThought->fresh_timeout = srcThought->fresh_timeout; } diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 44d5826a3d..cd142c1e5f 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1226,7 +1226,7 @@ public: auto srcThought = &src->thoughts[i]; auto dstThought = &dst->thoughts[i]; dstThought->type = (PeepThoughtType)srcThought->type; - dstThought->item = srcThought->type; + dstThought->item = srcThought->item; dstThought->freshness = srcThought->freshness; dstThought->fresh_timeout = srcThought->fresh_timeout; } From 8b6012a44b111911e09da3a358fcd0473920f4ec Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 2 Mar 2019 04:46:31 +0100 Subject: [PATCH 2/4] Add missing field "no_of_food" to importer/exporter. --- src/openrct2/rct2/S6Exporter.cpp | 1 + src/openrct2/rct2/S6Importer.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 0208cfd9b8..4bae0088e9 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -984,6 +984,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const rct_peep* src) dst->paid_on_rides = src->paid_on_rides; dst->paid_on_food = src->paid_on_food; dst->paid_on_souvenirs = src->paid_on_souvenirs; + dst->no_of_food = src->no_of_food; dst->no_of_drinks = src->no_of_drinks; dst->no_of_souvenirs = src->no_of_souvenirs; dst->vandalism_seen = src->vandalism_seen; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index cd142c1e5f..1a11164096 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -1248,6 +1248,7 @@ public: dst->paid_on_rides = src->paid_on_rides; dst->paid_on_food = src->paid_on_food; dst->paid_on_souvenirs = src->paid_on_souvenirs; + dst->no_of_food = src->no_of_food; dst->no_of_drinks = src->no_of_drinks; dst->no_of_souvenirs = src->no_of_souvenirs; dst->vandalism_seen = src->vandalism_seen; From 538526f075a9a7a35db175ecd5075a1809b0b65d Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 2 Mar 2019 04:51:20 +0100 Subject: [PATCH 3/4] Bump up network version. --- src/openrct2/network/Network.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index a5260212cf..5a2d7e1f90 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -31,7 +31,7 @@ // This string specifies which version of network stream current build uses. // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "49" +#define NETWORK_STREAM_VERSION "50" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static rct_peep* _pickup_peep = nullptr; From d1cb2cc73800570b9a577094dc5153f548a5124c Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 2 Mar 2019 04:51:28 +0100 Subject: [PATCH 4/4] Update changelog.txt --- distribution/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 9f5b543a72..3795a618ba 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -76,6 +76,7 @@ - Fix: [#8720] Desync due to boats colliding with ghost pieces. - Fix: [#8739] Savegame from original game crashes when cruising through map. - Fix: [#8742] Access violation in vehicle_update_sound_params. +- Fix: [#8811] Some fields in the sv6 save file not being copied correctly. - Improved: [#2940] Allow mouse-dragging to set patrol area (Singleplayer only). - Improved: [#7730] Draw extreme vertical and lateral Gs red in the ride window's graph tab. - Improved: [#7930] Automatically create folders for custom content.