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

Fix #6990: Scenery not correctly marked as available

Browse Source
This commit is contained in:
Gymnasiast
2018-01-10 20:29:20 +01:00
parent ddd8479827
commit 8fb0046136
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/rct2/RCT2.h
View File

@@ -36,7 +36,9 @@
#define RCT2_MAX_ANIMATED_OBJECTS 2000
#define RCT2_MAX_RESEARCHED_RIDE_TYPE_QUADS 8 // With 32 bits per uint32, this means there is room for 256 types.
#define RCT2_MAX_RESEARCHED_RIDE_ENTRY_QUADS 8 // With 32 bits per uint32, this means there is room for 256 entries.
#define RCT2_MAX_RESEARCHED_SCENERY_ITEM_QUADS 56 // With 32 bits per uint32, this means there is room for 1792 items.
#define RCT2_MAX_RESEARCHED_SCENERY_ITEM_QUADS 56
#define RCT2_MAX_RESEARCHED_SCENERY_ITEMS (RCT2_MAX_RESEARCHED_SCENERY_ITEM_QUADS * 32) // There are 32 bits per quad.
typedef struct rct2_install_info {

3
src/openrct2/rct2/S6Importer.cpp
View File

@@ -236,7 +236,6 @@ public:
// pad_01357400
ImportResearchedRideTypes();
ImportResearchedRideEntries();
ImportResearchedSceneryItems();
// _s6.researched_track_types_a
// _s6.researched_track_types_b
@@ -733,7 +732,7 @@ public:
{
set_all_scenery_items_not_invented();
for (uint16 sceneryEntryIndex = 0; sceneryEntryIndex < RCT2_MAX_RESEARCHED_SCENERY_ITEM_QUADS; sceneryEntryIndex++)
for (uint16 sceneryEntryIndex = 0; sceneryEntryIndex < RCT2_MAX_RESEARCHED_SCENERY_ITEMS; sceneryEntryIndex++)
{
sint32 quadIndex = sceneryEntryIndex >> 5;
sint32 bitIndex = sceneryEntryIndex & 0x1F;

2
src/openrct2/scenario/Scenario.h
View File

@@ -151,7 +151,7 @@ typedef struct rct_s6_data {
uint8 security_colour;
// Ignored in scenario
uint32 researched_scenery_items[56];
uint32 researched_scenery_items[RCT2_MAX_RESEARCHED_SCENERY_ITEM_QUADS];
// SC6[9]
uint16 park_rating;