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

Label known flags

Browse Source
This commit is contained in:
duncanspumpkin
2017-02-15 21:41:03 +00:00
parent d40bbd7f5c
commit cab367aa24
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/ride/ride.c
View File

@@ -6621,7 +6621,7 @@ void game_command_set_ride_price(sint32 *eax, sint32 *ebx, sint32 *ecx, sint32 *
*ebx = 0; // for cost check - changing ride price does not cost anything
gCommandExpenditureType = RCT_EXPENDITURE_TYPE_PARK_RIDE_TICKETS;
if (flags & 0x1) {
if (flags & GAME_COMMAND_FLAG_APPLY) {
uint32 shop_item;
if (ride->overall_view != (uint16)-1) {

2
src/openrct2/ride/ride_data.c
View File

@@ -1585,7 +1585,7 @@ const rct_ride_entry_vehicle CableLiftVehicle = {
.car_friction = 0,
.tab_height = 0,
.num_seats = 0,
.sprite_flags = 0x7,
.sprite_flags = VEHICLE_SPRITE_FLAG_FLAT | VEHICLE_SPRITE_FLAG_GENTLE_SLOPES | VEHICLE_SPRITE_FLAG_STEEP_SLOPES,
.sprite_width = 0,
.sprite_height_negative = 0,
.sprite_height_positive = 0,

12
src/openrct2/ride/vehicle_paint.c
View File

@@ -895,10 +895,10 @@ static void vehicle_sprite_paint(rct_vehicle *vehicle, sint32 ebx, sint32 ecx, s
sint32 baseImage_id = ebx;
vehicle_boundbox bb = VehicleBoundboxes[vehicleEntry->draw_order][ecx];
if (vehicleEntry->flags_a & 0x4000) {
if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_14) {
baseImage_id += (vehicle->var_BA / 8) & 31;
}
if (vehicleEntry->flags_b & 0x80) {
if (vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_A_7) {
baseImage_id += vehicle->var_C5;
}
uint32 rotation = get_current_rotation();
@@ -913,7 +913,7 @@ static void vehicle_sprite_paint(rct_vehicle *vehicle, sint32 ebx, sint32 ecx, s
for (sint32 i = 0; i < 8; i++){
if (vehicle->num_peeps > (i * 2) && vehicleEntry->no_seating_rows > i) {
image_id = baseImage_id | (vehicle->peep_tshirt_colours[i * 2] << 19) | (vehicle->peep_tshirt_colours[(i * 2) + 1] << 24) | 0xA0000000;
if (i == 0 && vehicleEntry->flags_b & 0x100) {
if (i == 0 && vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_A_8) {
image_id += (vehicleEntry->no_vehicle_images * vehicle->var_C5);
}
sub_98199C(image_id, 0, 0, bb.length_x, bb.length_y, bb.length_z, z, bb.offset_x, bb.offset_y, bb.offset_z + z, rotation);
@@ -934,7 +934,7 @@ static void vehicle_sprite_paint_6D520E(rct_vehicle *vehicle, sint32 ebx, sint32
static void vehicle_sprite_paint_6D51EB(rct_vehicle *vehicle, sint32 ebx, sint32 z, const rct_ride_entry_vehicle *vehicleEntry)
{
sint32 ecx = ebx / 2;
if (vehicleEntry->flags_a & 0x800) {
if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_11) {
ebx = ebx / 2;
}
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_15) {
@@ -1343,7 +1343,7 @@ static void vehicle_sprite_1(rct_vehicle *vehicle, sint32 imageDirection, sint32
static void vehicle_sprite_2_0(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry)
{
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) {
if (vehicleEntry->flags_a & 0x4000) {
if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_14) {
sint32 ecx = (imageDirection / 2) + 16;
sint32 ebx = (((imageDirection / 8) + 8) * vehicleEntry->var_16) + vehicleEntry->var_20;
vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry);
@@ -1563,7 +1563,7 @@ static void vehicle_sprite_5(rct_vehicle *vehicle, sint32 imageDirection, sint32
static void vehicle_sprite_6_0(rct_vehicle *vehicle, sint32 imageDirection, sint32 z, const rct_ride_entry_vehicle *vehicleEntry)
{
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) {
if (vehicleEntry->flags_a & 0x4000) {
if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_14) {
sint32 ecx = ((imageDirection / 2) ^ 8) + 16;
sint32 ebx = (((imageDirection / 8) + 12) * vehicleEntry->var_16) + vehicleEntry->var_20;
vehicle_sprite_paint_6D520E(vehicle, ebx, ecx, z, vehicleEntry);

6
src/openrct2/ride/water/submarine_ride.c
View File

@@ -32,17 +32,17 @@ void vehicle_visual_submarine(sint32 x, sint32 imageDirection, sint32 y, sint32
sint32 baseImage_id = imageDirection;
sint32 image_id;
if (vehicle->restraints_position >= 64) {
if ((vehicleEntry->sprite_flags & 0x2000) && !(imageDirection & 3)) {
if ((vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION) && !(imageDirection & 3)) {
baseImage_id /= 8;
baseImage_id += ((vehicle->restraints_position - 64) / 64) * 4;
baseImage_id *= vehicleEntry->var_16;
baseImage_id += vehicleEntry->var_1C;
}
} else {
if (vehicleEntry->flags_a & 0x800) {
if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_11) {
baseImage_id /= 2;
}
if (vehicleEntry->sprite_flags & 0x8000) {
if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_15) {
baseImage_id /= 8;
}
baseImage_id *= vehicleEntry->var_16;