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

(svn r12870) -Codechange: remove some magic numbers from u.ship.state handling

Browse Source
This commit is contained in:
smatz
2008-04-24 13:05:51 +00:00
parent 5ac07a2c34
commit 345f160978
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ship_cmd.cpp
View File

@@ -282,26 +282,22 @@ static const TileIndexDiffC _ship_leave_depot_offs[] = {
static void CheckShipLeaveDepot(Vehicle *v)
{
TileIndex tile;
Axis axis;
uint m;
if (!v->IsInDepot()) return;
tile = v->tile;
axis = GetShipDepotAxis(tile);
TileIndex tile = v->tile;
Axis axis = GetShipDepotAxis(tile);
/* Check first side */
/* Check first (north) side */
if (_ship_sometracks[axis] & GetTileShipTrackStatus(TILE_ADD(tile, ToTileIndexDiff(_ship_leave_depot_offs[axis])))) {
m = (axis == AXIS_X) ? 0x101 : 0x207;
/* Check second side */
v->direction = ReverseDir(AxisToDirection(axis));
/* Check second (south) side */
} else if (_ship_sometracks[axis + 2] & GetTileShipTrackStatus(TILE_ADD(tile, -2 * ToTileIndexDiff(_ship_leave_depot_offs[axis])))) {
m = (axis == AXIS_X) ? 0x105 : 0x203;
v->direction = AxisToDirection(axis);
} else {
return;
}
v->direction = (Direction)GB(m, 0, 8);
v->u.ship.state = (TrackBits)GB(m, 8, 8);
v->u.ship.state = AxisToTrackBits(axis);
v->vehstatus &= ~VS_HIDDEN;
v->cur_speed = 0;