(svn r5120) Add IsShipInDepot{Stopped,}() and remove some redundant checks

This commit is contained in:
tron
2006-06-05 11:28:00 +00:00
parent b0801e4e63
commit cb13a1e43d
3 changed files with 18 additions and 16 deletions

View File

@@ -4,6 +4,7 @@
#include "openttd.h"
#include "road_map.h"
#include "roadveh.h"
#include "ship.h"
#include "spritecache.h"
#include "table/sprites.h"
#include "table/strings.h"
@@ -1990,7 +1991,7 @@ Trackdir GetVehicleTrackdir(const Vehicle* v)
return TrackDirectionToTrackdir(FIND_FIRST_BIT(v->u.rail.track),v->direction);
case VEH_Ship:
if (v->u.ship.state == 0x80) /* Inside a depot? */
if (IsShipInDepot(v))
/* We'll assume the ship is facing outwards */
return DiagdirToDiagTrackdir(GetShipDepotDirection(v->tile));