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

Integrate gLastEntranceStyle

This commit is contained in:
Ted John 2016-09-04 15:21:49 +01:00
parent 5893c6da82
commit e47b8d906e
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addresses.h
View File

@ -209,7 +209,6 @@
#define RCT2_ADDRESS_CURRENT_PARK_VALUE 0x0135853C
#define RCT2_ADDRESS_AWARD_LIST 0x01358760
#define RCT2_ADDRESS_SAME_PRICE_THROUGHOUT 0x01358838
#define RCT2_ADDRESS_LAST_ENTRANCE_STYLE 0x01358840
#define RCT2_ADDRESS_SAME_PRICE_THROUGHOUT_EXTENDED 0x0135934C
#define RCT2_ADDRESS_PEEP_SPAWNS 0x013573F2
@ -572,6 +571,7 @@
#define RCT2_ADDRESS_NEXT_RESEARCH_EXPECTED_DAY 0x013580E7
#define RCT2_ADDRESS_NEXT_RESEARCH_EXPECTED_MONTH 0x013580E8
#define RCT2_ADDRESS_LAST_ENTRANCE_STYLE 0x01358840
#define RCT2_RESEARCH_ITEMS 0x01358844
#define RCT2_ADDRESS_RESEARCHED_RIDE_TYPES 0x01357404
#define RCT2_ADDRESS_RESEARCHED_RIDE_ENTRIES 0x01357424

2
src/rct2/S6Exporter.cpp
View File

@ -368,7 +368,7 @@ void S6Exporter::Export()
_s6.same_price_throughout = gSamePriceThroughoutParkA;
_s6.suggested_max_guests = _suggestedGuestMaximum;
_s6.park_rating_warning_days = gScenarioParkRatingWarningDays;
_s6.last_entrance_style = RCT2_GLOBAL(RCT2_ADDRESS_LAST_ENTRANCE_STYLE, uint8);
_s6.last_entrance_style = gLastEntranceStyle;
// rct1_water_colour
// pad_01358842
memcpy(_s6.research_items, gResearchItems, sizeof(_s6.research_items));

2
src/rct2/S6Importer.cpp
View File

@ -286,7 +286,7 @@ void S6Importer::Import()
gSamePriceThroughoutParkA = _s6.same_price_throughout;
_suggestedGuestMaximum = _s6.suggested_max_guests;
gScenarioParkRatingWarningDays = _s6.park_rating_warning_days;
RCT2_GLOBAL(RCT2_ADDRESS_LAST_ENTRANCE_STYLE, uint8) = _s6.last_entrance_style;
gLastEntranceStyle = _s6.last_entrance_style;
// rct1_water_colour
// pad_01358842
memcpy(gResearchItems, _s6.research_items, sizeof(_s6.research_items));

4
src/ride/ride.c
View File

@ -175,6 +175,8 @@ uint8 gRideEntranceExitPlaceStationIndex;
uint8 gRideEntranceExitPlacePreviousRideConstructionState;
uint8 gRideEntranceExitPlaceDirection;
uint8 gLastEntranceStyle;
// Static function declarations
rct_peep *find_closest_mechanic(int x, int y, int forInspection);
static void ride_breakdown_status_update(int rideIndex);
@ -6560,7 +6562,7 @@ void game_command_set_ride_appearance(int *eax, int *ebx, int *ecx, int *edx, in
case 6:
if (apply) {
ride->entrance_style = value;
RCT2_GLOBAL(RCT2_ADDRESS_LAST_ENTRANCE_STYLE, uint8) = value;
gLastEntranceStyle = value;
gfx_invalidate_screen();
}
break;

2
src/ride/ride.h
View File

@ -973,6 +973,8 @@ extern int gRideRemoveTrackPieceCallbackZ;
extern int gRideRemoveTrackPieceCallbackDirection;
extern int gRideRemoveTrackPieceCallbackType;
extern uint8 gLastEntranceStyle;
int ride_get_count();
int ride_get_total_queue_length(rct_ride *ride);
int ride_get_max_queue_time(rct_ride *ride);

2
src/scenario.c
View File

@ -267,7 +267,7 @@ void scenario_begin()
duck_remove_all();
park_calculate_size();
staff_reset_stats();
RCT2_GLOBAL(RCT2_ADDRESS_LAST_ENTRANCE_STYLE, uint8) = 0;
gLastEntranceStyle = RIDE_ENTRANCE_STYLE_PLAIN;
memset(RCT2_ADDRESS(0x001358102, void), 0, 20);
RCT2_GLOBAL(0x00135882E, uint16) = 0;