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. diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp index 4c1bd51531..21849810c3 100644 --- a/src/openrct2/rct2/S6Exporter.cpp +++ b/src/openrct2/rct2/S6Exporter.cpp @@ -962,7 +962,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const 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; } @@ -984,6 +984,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const 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 1479dbd471..1cd13ac8f0 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; } @@ -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;