petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r3784) Add a type and functions to handle direction changes

Browse Source
This commit is contained in:
tron
2006-03-08 07:48:56 +00:00
parent fbe939b31f
commit ecabf8a5f0
4 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
aircraft_cmd.c
View File

@@ -764,7 +764,7 @@ static bool AircraftController(Vehicle *v)
Station *st;
const AirportMovingData *amd;
Vehicle *u;
byte z,dirdiff,newdir,maxz,curz;
byte z,newdir,maxz,curz;
GetNewVehiclePosResult gp;
uint dist;
int x,y;
@@ -853,20 +853,22 @@ static bool AircraftController(Vehicle *v)
// At final pos?
if (dist == 0) {
DirDiff dirdiff;
if (v->cur_speed > 12) v->cur_speed = 12;
// Change direction smoothly to final direction.
dirdiff = amd->direction - v->direction;
dirdiff = DirDifference(amd->direction, v->direction);
// if distance is 0, and plane points in right direction, no point in calling
// UpdateAircraftSpeed(). So do it only afterwards
if (dirdiff == 0) {
if (dirdiff == DIRDIFF_SAME) {
v->cur_speed = 0;
return true;
}
if (!UpdateAircraftSpeed(v)) return false;
v->direction = (v->direction+((dirdiff&7)<5?1:-1)) & 7;
v->direction = ChangeDir(v->direction, dirdiff > DIRDIFF_REVERSE ? DIRDIFF_45LEFT : DIRDIFF_45RIGHT);
v->cur_speed >>= 1;
SetAircraftPosition(v, v->x_pos, v->y_pos, v->z_pos);