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

add last_crash_type to ride struct

This commit is contained in:
IntelOrca 2015-06-16 00:16:59 +01:00
parent df491e58b9
commit 705efbeee9
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/management/award.c
View File

@ -238,7 +238,7 @@ static int award_is_deserved_safest(int awardType, int activeAwardTypes)
// Check for rides that have crashed maybe?
FOR_ALL_RIDES(i, ride)
if (ride->var_1AE != 0)
if (ride->last_crash_type != RIDE_CRASH_TYPE_NONE)
return 0;
return 1;

8
src/ride/ride.h
View File

@ -293,7 +293,7 @@ typedef struct {
uint32 no_secondary_items_sold; // 0x1A8
uint8 var_1AC;
uint8 var_1AD;
uint8 var_1AE;
uint8 last_crash_type;
uint8 connected_message_throttle; // 0x1AF
money32 income_per_hour; // 0x1B0
money32 profit; // 0x1B4
@ -736,6 +736,12 @@ enum {
RIDE_TYPE_FLAG_SUPPORTS_MULTIPLE_TRACK_COLOUR = 1 << 31,
};
enum {
RIDE_CRASH_TYPE_NONE = 0,
RIDE_CRASH_TYPE_NO_FATALITIES = 2,
RIDE_CRASH_TYPE_FATALITIES = 8
};
#define MAX_RIDES 255
#define MAX_RIDE_MEASUREMENTS 8