mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Fix #6452: scenario text truncated when switching architectures

Browse Source 
`ScenarioFileIndex`'s `Serialize` and `Deserialize` now read and write each
individual value of a `scenario_index_entry` instead of the entire struct
at once. Thus the difference in pointer sizes of `highscore` on different
architecture builds will not cause issues with `scenarios.idx`.
This commit is contained in:
Robert Jordan
2017-10-13 04:00:42 -04:00
committed by Michael Steenbeek
parent 7dad101f70
commit 7d6bfa19ea
2 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -42,6 +42,7 @@
- Fix: [#6423] Importing parks containing names with Polish characters.
- Fix: [#6423] Polish characters now correctly drawn when using the sprite font.
- Fix: [#6445] Guests' favourite ride improperly set when importing from RCT1 or AA.
- Fix: [#6452] Scenario text cut off when switching between 32 and 64-bit builds.
- Fix: Infinite loop when removing scenery elements with >127 base height.
- Fix: Ghosting of transparent map elements when the viewport is moved in OpenGL mode.
- Fix: Clear IME buffer after committing composed text.

45
src/openrct2/scenario/ScenarioRepository.cpp
View File

@@ -123,7 +123,7 @@ class ScenarioFileIndex final : public FileIndex<scenario_index_entry>
{
private:
static constexpr uint32 MAGIC_NUMBER = 0x58444953; // SIDX
static constexpr uint16 VERSION = 1;
static constexpr uint16 VERSION = 2;
static constexpr auto PATTERN = "*.sc4;*.sc6";
public:
@@ -157,18 +157,45 @@ protected:
void Serialise(IStream * stream, const scenario_index_entry &item) const override
{
// HACK: Zero highscore pointer
auto copy = item;
copy.highscore = nullptr;
stream->WriteValue(copy);
stream->Write(item.path, sizeof(item.path));
stream->WriteValue(item.timestamp);
stream->WriteValue(item.category);
stream->WriteValue(item.source_game);
stream->WriteValue(item.source_index);
stream->WriteValue(item.sc_id);
stream->WriteValue(item.objective_type);
stream->WriteValue(item.objective_arg_1);
stream->WriteValue(item.objective_arg_2);
stream->WriteValue(item.objective_arg_3);
stream->Write(item.name, sizeof(item.name));
stream->Write(item.details, sizeof(item.details));
}
scenario_index_entry Deserialise(IStream * stream) const override
{
auto result = stream->ReadValue<scenario_index_entry>();
// HACK: Zero highscore pointer
result.highscore = nullptr;
return result;
scenario_index_entry item;
stream->Read(item.path, sizeof(item.path));
item.timestamp = stream->ReadValue<uint64>();
item.category = stream->ReadValue<uint8>();
item.source_game = stream->ReadValue<uint8>();
item.source_index = stream->ReadValue<sint16>();
item.sc_id = stream->ReadValue<uint16>();
item.objective_type = stream->ReadValue<uint8>();
item.objective_arg_1 = stream->ReadValue<uint8>();
item.objective_arg_2 = stream->ReadValue<sint32>();
item.objective_arg_3 = stream->ReadValue<sint16>();
item.highscore = nullptr;
stream->Read(item.name, sizeof(item.name));
stream->Read(item.details, sizeof(item.details));
return item;
}
private: