mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Name/fix various RCT1/RCT2 limits

This commit is contained in:
Michael Steenbeek 2018-01-09 10:36:41 +01:00
parent 9c84ae30fb
commit 0296608623
8 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/rct1.h
View File

@ -27,7 +27,7 @@
#include "world/sprite.h"
#include "world/map_animation.h"
#define RCT1_MAX_TILE_ELEMENTS 0xC000
#define RCT1_MAX_TILE_ELEMENTS 0xC000
#define RCT1_MAX_SPRITES 5000
#define RCT1_MAX_TRAINS_PER_RIDE 12
#define RCT1_MAX_MAP_SIZE 128
@ -708,7 +708,7 @@ typedef struct rct1_s4 {
rct_banner banners[100];
char string_table[RCT12_MAX_USER_STRINGS][RCT12_USER_STRING_MAX_LENGTH];
uint32 game_time_counter;
rct1_ride rides[255];
rct1_ride rides[RCT12_MAX_RIDES_IN_PARK];
uint16 unk_game_time_counter;
uint16 view_x;
uint16 view_y;
@ -793,9 +793,9 @@ typedef struct rct_track_td4 {
money16 upkeep_cost; // 0x36
// Added Attractions / Loopy Landscapes only
uint8 track_spine_colour[4]; // 0x38
uint8 track_rail_colour[4]; // 0x3C
uint8 track_support_colour[4]; // 0x40
uint8 track_spine_colour[RCT12_NUM_COLOUR_SCHEMES]; // 0x38
uint8 track_rail_colour[RCT12_NUM_COLOUR_SCHEMES]; // 0x3C
uint8 track_support_colour[RCT12_NUM_COLOUR_SCHEMES]; // 0x40
uint8 flags2; // 0x44
uint8 var_45[0x7F]; // 0x45

2
src/openrct2/rct1/S4Importer.cpp
View File

@ -689,7 +689,7 @@ private:
void ImportRides()
{
for (sint32 i = 0; i < MAX_RIDES; i++)
for (sint32 i = 0; i < RCT12_MAX_RIDES_IN_PARK; i++)
{
if (_s4.rides[i].type != RIDE_TYPE_NULL)
{

1
src/openrct2/rct12.h
View File

@ -20,6 +20,7 @@
#include "common.h"
#define RCT12_MAX_RIDES_IN_PARK 255
#define RCT12_MAX_AWARDS 4
#define RCT12_MAX_NEWS_ITEMS 61
#define RCT12_MAX_STATIONS_PER_RIDE 4

1
src/openrct2/rct2.h
View File

@ -22,7 +22,6 @@
#include "common.h"
#include "rct12.h"
#define RCT2_MAX_RIDES_IN_PARK 255
#define RCT2_MAX_STAFF 200
#define RCT2_MAX_BANNERS_IN_PARK 250
#define RCT2_MAX_VEHICLES_PER_RIDE 32

2
src/openrct2/rct2/S6Exporter.cpp
View File

@ -428,7 +428,7 @@ uint32 S6Exporter::GetLoanHash(money32 initialCash, money32 bankLoan, uint32 max
void S6Exporter::ExportRides()
{
for (sint32 index = 0; index < RCT2_MAX_RIDES_IN_PARK; index++)
for (sint32 index = 0; index < RCT12_MAX_RIDES_IN_PARK; index++)
{
auto src = get_ride(index);
auto dst = &_s6.rides[index];

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

@ -460,7 +460,7 @@ public:
void ImportRides()
{
for (uint16 index = 0; index < RCT2_MAX_RIDES_IN_PARK; index++)
for (uint16 index = 0; index < RCT12_MAX_RIDES_IN_PARK; index++)
{
auto src = &_s6.rides[index];
auto dst = get_ride(index);

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

@ -714,7 +714,7 @@ void scenario_remove_trackless_rides(rct_s6_data *s6)
{
bool rideHasTrack[MAX_RIDES];
ride_all_has_any_track_elements(rideHasTrack);
for (sint32 i = 0; i < RCT2_MAX_RIDES_IN_PARK; i++) {
for (sint32 i = 0; i < RCT12_MAX_RIDES_IN_PARK; i++) {
rct2_ride * ride = &s6->rides[i];
if (rideHasTrack[i] || ride->type == RIDE_TYPE_NULL) {

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

@ -255,7 +255,7 @@ typedef struct rct_s6_data {
rct_banner banners[RCT2_MAX_BANNERS_IN_PARK];
char custom_strings[RCT12_MAX_USER_STRINGS][RCT12_USER_STRING_MAX_LENGTH];
uint32 game_ticks_1;
rct2_ride rides[RCT2_MAX_RIDES_IN_PARK];
rct2_ride rides[RCT12_MAX_RIDES_IN_PARK];
uint16 saved_age;
uint16 saved_view_x;
uint16 saved_view_y;
@ -290,8 +290,9 @@ typedef struct rct_s6_data {
uint8 current_rain_level;
uint8 next_rain_level;
rct12_news_item news_items[RCT12_MAX_NEWS_ITEMS];
uint8 pad_13CE730[64];
uint32 rct1_scenario_flags;
char rct1_scenario_name[62]; // Unused in RCT2
uint16 rct1_scenario_slot_index; // Unused in RCT2
uint32 rct1_scenario_flags; // Unused in RCT2
uint16 wide_path_tile_loop_x;
uint16 wide_path_tile_loop_y;
uint8 pad_13CE778[434];