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

Label known offsets. 

Fixed a small issue with downtime history not being reset correctly on new ride creation
This commit is contained in:
duncanspumpkin 2016-02-17 20:03:40 +00:00
parent 9e391d7e03
commit 1e3a82a4ee
3 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/peep/peep.c
View File

@ -2905,13 +2905,13 @@ static void peep_update_ride_sub_state_15(rct_peep* peep){
peep->destination_x++;
return;
case 1:
if (ride->var_15D != 0)
if (ride->slide_in_use != 0)
return;
ride->var_15D++;
ride->slide_in_use++;
ride->slide_peep = peep->sprite_index;
ride->slide_peep_t_shirt_colour = peep->tshirt_colour;
ride->var_176 = 0;
ride->spiral_slide_progress = 0;
peep->destination_x++;
return;
case 2:

49
src/ride/ride.c
View File

@ -1086,7 +1086,7 @@ void ride_remove_peeps(int rideIndex)
}
ride->num_riders = 0;
ride->var_15D = 0;
ride->slide_in_use = 0;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAIN;
}
@ -2001,14 +2001,14 @@ static void ride_spiral_slide_update(rct_ride *ride)
if (RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32) & 3)
return;
if (ride->var_15D == 0)
if (ride->slide_in_use == 0)
return;
ride->var_176++;
if (ride->var_176 >= 48) {
ride->var_15D--;
ride->spiral_slide_progress++;
if (ride->spiral_slide_progress >= 48) {
ride->slide_in_use--;
peep = &(g_sprite_list[ride->maze_tiles].peep);
peep = GET_PEEP(ride->slide_peep);
peep->destination_x++;
}
@ -2126,27 +2126,23 @@ static void ride_breakdown_update(int rideIndex)
return;
if (ride->lifecycle_flags & (RIDE_LIFECYCLE_BROKEN_DOWN | RIDE_LIFECYCLE_CRASHED))
ride->var_19C++;
ride->downtime_history[0]++;
if (!(RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_TICKS, uint32) & 8191)) {
int ax =
ride->var_19C +
ride->var_19D +
ride->var_19E +
ride->var_19F +
ride->var_1A0 +
ride->var_1A2 +
ride->var_1A3;
ride->downtime = min(ax / 2, 100);
int totalDowntime =
ride->downtime_history[0] +
ride->downtime_history[1] +
ride->downtime_history[2] +
ride->downtime_history[3] +
ride->downtime_history[4] +
ride->downtime_history[5] +
ride->downtime_history[6] +
ride->downtime_history[7];
ride->downtime = min(totalDowntime / 2, 100);
ride->var_1A3 = ride->var_1A2;
ride->var_1A2 = ride->var_1A1;
ride->var_1A1 = ride->var_1A0;
ride->var_1A0 = ride->var_19F;
ride->var_19F = ride->var_19E;
ride->var_19E = ride->var_19D;
ride->var_19D = ride->var_19C;
ride->var_19C = 0;
memmove(&ride->downtime_history[1], ride->downtime_history, sizeof(ride->downtime_history));
ride->downtime_history[0] = 0;
ride->window_invalidate_flags |= RIDE_INVALIDATE_RIDE_MAINTENANCE;
}
@ -5910,7 +5906,7 @@ foundRideEntry:
ride->total_customers = 0;
ride->total_profit = 0;
ride->num_riders = 0;
ride->var_15D = 0;
ride->slide_in_use = 0;
ride->maze_tiles = 0;
ride->build_date = RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_MONTH_YEAR, uint16);
ride->music_tune_id = 255;
@ -5922,8 +5918,7 @@ foundRideEntry:
ride->inspection_interval = RIDE_INSPECTION_EVERY_30_MINUTES;
ride->last_inspection = 0;
ride->downtime = 0;
ride->var_19C = 0;
ride->var_1A0 = 0;
memset(ride->downtime_history, 0, sizeof(ride->downtime_history));
ride->no_primary_items_sold = 0;
ride->no_secondary_items_sold = 0;
ride->last_crash_type = RIDE_CRASH_TYPE_NONE;

13
src/ride/ride.h
View File

@ -252,7 +252,7 @@ typedef struct {
uint8 popularity_next; // 0x15A When timeout reached this will be the next popularity
uint8 num_riders; // 0x15B
uint8 music_tune_id; // 0x15C
uint8 var_15D;
uint8 slide_in_use; // 0x15D
union {
uint16 slide_peep; // 0x15E
uint16 maze_tiles; // 0x15E
@ -260,7 +260,7 @@ typedef struct {
uint8 pad_160[0xE];
uint8 slide_peep_t_shirt_colour;// 0x16E
uint8 pad_16F[0x7];
uint8 var_176;
uint8 spiral_slide_progress; // 0x176
uint8 pad_177[0x9];
sint16 build_date; // 0x180
money16 upkeep_cost; // 0x182
@ -285,14 +285,7 @@ typedef struct {
uint8 downtime; // 0x199
uint8 inspection_interval; // 0x19A
uint8 last_inspection; // 0x19B
uint8 var_19C;
uint8 var_19D;
uint8 var_19E;
uint8 var_19F;
uint8 var_1A0;
uint8 var_1A1;
uint8 var_1A2;
uint8 var_1A3;
uint8 downtime_history[8]; // 0x19C
uint32 no_primary_items_sold; // 0x1A4
uint32 no_secondary_items_sold; // 0x1A8
uint8 breakdown_sound_modifier; // 0x1AC