mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 09:44:52 +01:00
Code Issues Releases Wiki Activity

Merge branch 'janisozaur-duck_move_offset' into develop

Browse Source
This commit is contained in:
Ted John
2016-09-18 21:50:13 +01:00
parent 8ffe9cdcf6 2258652e83
commit a3be4d68f3
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ride/vehicle.c
View File

@@ -6997,7 +6997,7 @@ static void sub_6DB807(rct_vehicle *vehicle)
sprite_move(x, y, z, (rct_sprite*)vehicle);
}
extern const rct_xy16 duck_move_offset[];
extern const rct_xy16 duck_move_offset[4];
/**
* Collision Detection
@@ -7101,8 +7101,10 @@ static bool vehicle_update_motion_collision_detection(
if (direction < 0x14) continue;
uint32 next_x_diff = abs(x + duck_move_offset[(4 + vehicle->sprite_direction) >> 3].x - collideVehicle->x);
uint32 next_y_diff = abs(y + duck_move_offset[(4 + vehicle->sprite_direction) >> 3].y - collideVehicle->y);
uint32 offsetSpriteDirection = (vehicle->sprite_direction + 4) & 31;
uint32 offsetDirection = offsetSpriteDirection >> 3;
uint32 next_x_diff = abs(x + duck_move_offset[offsetDirection].x - collideVehicle->x);
uint32 next_y_diff = abs(y + duck_move_offset[offsetDirection].y - collideVehicle->y);
if (next_x_diff + next_y_diff < x_diff + y_diff){
mayCollide = true;

2
src/world/duck.c
View File

@@ -35,7 +35,7 @@ static void duck_update_double_drink(rct_duck *duck);
static void duck_update_fly_away(rct_duck *duck);
// rct2: 0x009A3B04
const rct_xy16 duck_move_offset[] = {
const rct_xy16 duck_move_offset[4] = {
{ -1, 0 },
{ 0, 1 },
{ 1, 0 },