mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r16721) -Codechange: make Is/SetRoadVehicleFront, Is/Set/HasArticulatedPart member of RoadVehicle.

release/1.0
rubidium 2009-07-02 08:59:27 +00:00
parent 77eaefb61c
commit 61e735ba4c
14 changed files with 76 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ai/api/ai_vehicle.cpp
View File

@ -412,7 +412,7 @@
const Vehicle *v = ::Vehicle::Get(vehicle_id); const Vehicle *v = ::Vehicle::Get(vehicle_id);
switch (v->type) { switch (v->type) {
case VEH_ROAD: return ::RoadVehHasArticPart(v); case VEH_ROAD: return ::RoadVehicle::From(v)->RoadVehHasArticPart();
case VEH_TRAIN: return ::Train::From(v)->EngineHasArticPart(); case VEH_TRAIN: return ::Train::From(v)->EngineHasArticPart();
default: NOT_REACHED(); default: NOT_REACHED();
} }

6
src/articulated_vehicles.cpp
View File

@ -211,7 +211,7 @@ bool IsArticulatedVehicleCarryingDifferentCargos(const Vehicle *v, CargoID *carg
break; break;
case VEH_ROAD: case VEH_ROAD:
v = (RoadVehHasArticPart(v) ? v->Next() : NULL); v = RoadVehicle::From(v)->RoadVehHasArticPart() ? v->Next() : NULL;
break; break;
default: default:
@ -258,7 +258,7 @@ void CheckConsistencyOfArticulatedVehicle(const Vehicle *v)
break; break;
case VEH_ROAD: case VEH_ROAD:
v = (RoadVehHasArticPart(v) ? v->Next() : NULL); v = RoadVehicle::From(v)->RoadVehHasArticPart() ? v->Next() : NULL;
break; break;
default: default:
@ -348,7 +348,7 @@ void AddArticulatedParts(Vehicle *first, VehicleType type)
rv->cargo_cap = 0; rv->cargo_cap = 0;
} }
SetRoadVehArticPart(rv); rv->SetArticulatedPart();
} break; } break;
} }

4
src/disaster_cmd.cpp
View File

@ -302,7 +302,7 @@ static bool DisasterTick_Ufo(DisasterVehicle *v)
RoadVehicle *u; RoadVehicle *u;
FOR_ALL_ROADVEHICLES(u) { FOR_ALL_ROADVEHICLES(u) {
if (IsRoadVehFront(u)) { if (u->IsRoadVehFront()) {
v->dest_tile = u->index; v->dest_tile = u->index;
v->age = 0; v->age = 0;
return true; return true;
@ -314,7 +314,7 @@ static bool DisasterTick_Ufo(DisasterVehicle *v)
} else { } else {
/* Target a vehicle */ /* Target a vehicle */
RoadVehicle *u = RoadVehicle::Get(v->dest_tile); RoadVehicle *u = RoadVehicle::Get(v->dest_tile);
assert(u != NULL && u->type == VEH_ROAD && IsRoadVehFront(u)); assert(u != NULL && u->type == VEH_ROAD && u->IsRoadVehFront());
uint dist = Delta(v->x_pos, u->x_pos) + Delta(v->y_pos, u->y_pos); uint dist = Delta(v->x_pos, u->x_pos) + Delta(v->y_pos, u->y_pos);

2
src/roadstop.cpp
View File

@ -40,7 +40,7 @@ RoadStop *RoadStop::GetNextRoadStop(const RoadVehicle *v) const
/* The vehicle cannot go to this roadstop (different roadtype) */ /* The vehicle cannot go to this roadstop (different roadtype) */
if ((GetRoadTypes(rs->xy) & v->compatible_roadtypes) == ROADTYPES_NONE) continue; if ((GetRoadTypes(rs->xy) & v->compatible_roadtypes) == ROADTYPES_NONE) continue;
/* The vehicle is articulated and can therefor not go the a standard road stop */ /* The vehicle is articulated and can therefor not go the a standard road stop */
if (IsStandardRoadStopTile(rs->xy) && RoadVehHasArticPart(v)) continue; if (IsStandardRoadStopTile(rs->xy) && v->RoadVehHasArticPart()) continue;
/* The vehicle can actually go to this road stop. So, return it! */ /* The vehicle can actually go to this road stop. So, return it! */
return rs; return rs;

60
src/roadveh.h
View File

@ -72,36 +72,6 @@ enum RoadVehicleSubType {
RVST_ARTIC_PART, RVST_ARTIC_PART,
}; };
static inline bool IsRoadVehFront(const Vehicle *v)
{
assert(v->type == VEH_ROAD);
return v->subtype == RVST_FRONT;
}
static inline void SetRoadVehFront(Vehicle *v)
{
assert(v->type == VEH_ROAD);
v->subtype = RVST_FRONT;
}
static inline bool IsRoadVehArticPart(const Vehicle *v)
{
assert(v->type == VEH_ROAD);
return v->subtype == RVST_ARTIC_PART;
}
static inline void SetRoadVehArticPart(Vehicle *v)
{
assert(v->type == VEH_ROAD);
v->subtype = RVST_ARTIC_PART;
}
static inline bool RoadVehHasArticPart(const Vehicle *v)
{
assert(v->type == VEH_ROAD);
return v->Next() != NULL && IsRoadVehArticPart(v->Next());
}
void CcBuildRoadVeh(bool success, TileIndex tile, uint32 p1, uint32 p2); void CcBuildRoadVeh(bool success, TileIndex tile, uint32 p1, uint32 p2);
@ -142,7 +112,7 @@ struct RoadVehicle : public SpecializedVehicle<RoadVehicle, VEH_ROAD> {
void MarkDirty(); void MarkDirty();
void UpdateDeltaXY(Direction direction); void UpdateDeltaXY(Direction direction);
ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_ROADVEH_INC : EXPENSES_ROADVEH_RUN; } ExpensesType GetExpenseType(bool income) const { return income ? EXPENSES_ROADVEH_INC : EXPENSES_ROADVEH_RUN; }
bool IsPrimaryVehicle() const { return IsRoadVehFront(this); } bool IsPrimaryVehicle() const { return this->IsRoadVehFront(); }
SpriteID GetImage(Direction direction) const; SpriteID GetImage(Direction direction) const;
int GetDisplaySpeed() const { return this->cur_speed / 2; } int GetDisplaySpeed() const { return this->cur_speed / 2; }
int GetDisplayMaxSpeed() const { return this->max_speed / 2; } int GetDisplayMaxSpeed() const { return this->max_speed / 2; }
@ -154,6 +124,34 @@ struct RoadVehicle : public SpecializedVehicle<RoadVehicle, VEH_ROAD> {
Trackdir GetVehicleTrackdir() const; Trackdir GetVehicleTrackdir() const;
TileIndex GetOrderStationLocation(StationID station); TileIndex GetOrderStationLocation(StationID station);
bool FindClosestDepot(TileIndex *location, DestinationID *destination, bool *reverse); bool FindClosestDepot(TileIndex *location, DestinationID *destination, bool *reverse);
/**
* Check if vehicle is a front engine
* @return Returns true if vehicle is a front engine
*/
FORCEINLINE bool IsRoadVehFront() const { return this->subtype == RVST_FRONT; }
/**
* Set front engine state
*/
FORCEINLINE void SetRoadVehFront() { this->subtype = RVST_FRONT; }
/**
* Check if vehicl is an articulated part of an engine
* @return Returns true if vehicle is an articulated part
*/
FORCEINLINE bool IsArticulatedPart() const { return this->subtype == RVST_ARTIC_PART; }
/**
* Set a vehicle to be an articulated part
*/
FORCEINLINE void SetArticulatedPart() { this->subtype = RVST_ARTIC_PART; }
/**
* Check if an engine has an articulated part.
* @return True if the engine has an articulated part.
*/
FORCEINLINE bool RoadVehHasArticPart() const { return this->Next() != NULL && this->Next()->IsArticulatedPart(); }
}; };
#define FOR_ALL_ROADVEHICLES(var) FOR_ALL_VEHICLES_OF_TYPE(RoadVehicle, var) #define FOR_ALL_ROADVEHICLES(var) FOR_ALL_VEHICLES_OF_TYPE(RoadVehicle, var)

34
src/roadveh_cmd.cpp
View File

@ -138,7 +138,7 @@ byte GetRoadVehLength(const RoadVehicle *v)
void RoadVehUpdateCache(RoadVehicle *v) void RoadVehUpdateCache(RoadVehicle *v)
{ {
assert(v->type == VEH_ROAD); assert(v->type == VEH_ROAD);
assert(IsRoadVehFront(v)); assert(v->IsRoadVehFront());
v->InvalidateNewGRFCacheOfChain(); v->InvalidateNewGRFCacheOfChain();
@ -245,7 +245,7 @@ CommandCost CmdBuildRoadVeh(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
v->cur_image = SPR_IMG_QUERY; v->cur_image = SPR_IMG_QUERY;
v->random_bits = VehicleRandomBits(); v->random_bits = VehicleRandomBits();
SetRoadVehFront(v); v->SetRoadVehFront();
v->roadtype = HasBit(EngInfo(v->engine_type)->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD; v->roadtype = HasBit(EngInfo(v->engine_type)->misc_flags, EF_ROAD_TRAM) ? ROADTYPE_TRAM : ROADTYPE_ROAD;
v->compatible_roadtypes = RoadTypeToRoadTypes(v->roadtype); v->compatible_roadtypes = RoadTypeToRoadTypes(v->roadtype);
@ -304,7 +304,7 @@ bool RoadVehicle::IsStoppedInDepot() const
TileIndex tile = this->tile; TileIndex tile = this->tile;
if (!IsRoadDepotTile(tile)) return false; if (!IsRoadDepotTile(tile)) return false;
if (IsRoadVehFront(this) && !(this->vehstatus & VS_STOPPED)) return false; if (this->IsRoadVehFront() && !(this->vehstatus & VS_STOPPED)) return false;
for (const RoadVehicle *v = this; v != NULL; v = v->Next()) { for (const RoadVehicle *v = this; v != NULL; v = v->Next()) {
if (v->state != RVSB_IN_DEPOT || v->tile != tile) return false; if (v->state != RVSB_IN_DEPOT || v->tile != tile) return false;
@ -916,7 +916,7 @@ static void RoadVehCheckOvertake(RoadVehicle *v, RoadVehicle *u)
if (IsTileType(v->tile, MP_STATION)) return; if (IsTileType(v->tile, MP_STATION)) return;
/* For now, articulated road vehicles can't overtake anything. */ /* For now, articulated road vehicles can't overtake anything. */
if (RoadVehHasArticPart(v)) return; if (v->RoadVehHasArticPart()) return;
/* Vehicles are not driving in same direction || direction is not a diagonal direction */ /* Vehicles are not driving in same direction || direction is not a diagonal direction */
if (v->direction != u->direction || !(v->direction & 1)) return; if (v->direction != u->direction || !(v->direction & 1)) return;
@ -1027,7 +1027,7 @@ static Trackdir RoadFindPathToDest(RoadVehicle *v, TileIndex tile, DiagDirection
} else if (IsTileType(tile, MP_STATION) && IsStandardRoadStopTile(tile)) { } else if (IsTileType(tile, MP_STATION) && IsStandardRoadStopTile(tile)) {
/* Standard road stop (drive-through stops are treated as normal road) */ /* Standard road stop (drive-through stops are treated as normal road) */
if (!IsTileOwner(tile, v->owner) || GetRoadStopDir(tile) == enterdir || RoadVehHasArticPart(v)) { if (!IsTileOwner(tile, v->owner) || GetRoadStopDir(tile) == enterdir || v->RoadVehHasArticPart()) {
/* different station owner or wrong orientation or the vehicle has articulated parts */ /* different station owner or wrong orientation or the vehicle has articulated parts */
trackdirs = TRACKDIR_BIT_NONE; trackdirs = TRACKDIR_BIT_NONE;
} else { } else {
@ -1357,7 +1357,7 @@ static bool IndividualRoadVehicleController(RoadVehicle *v, const RoadVehicle *p
/* Vehicle is entering a depot or is on a bridge or in a tunnel */ /* Vehicle is entering a depot or is on a bridge or in a tunnel */
GetNewVehiclePosResult gp = GetNewVehiclePos(v); GetNewVehiclePosResult gp = GetNewVehiclePos(v);
if (IsRoadVehFront(v)) { if (v->IsRoadVehFront()) {
const Vehicle *u = RoadVehFindCloseTo(v, gp.x, gp.y, v->direction); const Vehicle *u = RoadVehFindCloseTo(v, gp.x, gp.y, v->direction);
if (u != NULL) { if (u != NULL) {
v->cur_speed = u->First()->cur_speed; v->cur_speed = u->First()->cur_speed;
@ -1389,7 +1389,7 @@ static bool IndividualRoadVehicleController(RoadVehicle *v, const RoadVehicle *p
TileIndex tile = v->tile + TileOffsByDiagDir((DiagDirection)(rd.x & 3)); TileIndex tile = v->tile + TileOffsByDiagDir((DiagDirection)(rd.x & 3));
Trackdir dir; Trackdir dir;
if (IsRoadVehFront(v)) { if (v->IsRoadVehFront()) {
/* If this is the front engine, look for the right path. */ /* If this is the front engine, look for the right path. */
dir = RoadFindPathToDest(v, tile, (DiagDirection)(rd.x & 3)); dir = RoadFindPathToDest(v, tile, (DiagDirection)(rd.x & 3));
} else { } else {
@ -1397,7 +1397,7 @@ static bool IndividualRoadVehicleController(RoadVehicle *v, const RoadVehicle *p
} }
if (dir == INVALID_TRACKDIR) { if (dir == INVALID_TRACKDIR) {
if (!IsRoadVehFront(v)) error("Disconnecting road vehicle."); if (!v->IsRoadVehFront()) error("Disconnecting road vehicle.");
v->cur_speed = 0; v->cur_speed = 0;
return false; return false;
} }
@ -1418,7 +1418,7 @@ again:
case TRACKDIR_RVREV_NW: needed = ROAD_SE; break; case TRACKDIR_RVREV_NW: needed = ROAD_SE; break;
} }
if ((v->Previous() != NULL && v->Previous()->tile == tile) || if ((v->Previous() != NULL && v->Previous()->tile == tile) ||
(IsRoadVehFront(v) && IsNormalRoadTile(tile) && !HasRoadWorks(tile) && (v->IsRoadVehFront() && IsNormalRoadTile(tile) && !HasRoadWorks(tile) &&
(needed & GetRoadBits(tile, ROADTYPE_TRAM)) != ROAD_NONE)) { (needed & GetRoadBits(tile, ROADTYPE_TRAM)) != ROAD_NONE)) {
/* /*
* Taking the 'big' corner for trams only happens when: * Taking the 'big' corner for trams only happens when:
@ -1430,7 +1430,7 @@ again:
* going to cause the tram to split up. * going to cause the tram to split up.
* - Or the front of the tram can drive over the next tile. * - Or the front of the tram can drive over the next tile.
*/ */
} else if (!IsRoadVehFront(v) || !CanBuildTramTrackOnTile(v->owner, tile, needed) || ((~needed & GetAnyRoadBits(v->tile, ROADTYPE_TRAM, false)) == ROAD_NONE)) { } else if (!v->IsRoadVehFront() || !CanBuildTramTrackOnTile(v->owner, tile, needed) || ((~needed & GetAnyRoadBits(v->tile, ROADTYPE_TRAM, false)) == ROAD_NONE)) {
/* /*
* Taking the 'small' corner for trams only happens when: * Taking the 'small' corner for trams only happens when:
* - We are not the from vehicle of an articulated tram. * - We are not the from vehicle of an articulated tram.
@ -1464,7 +1464,7 @@ again:
int y = TileY(tile) * TILE_SIZE + rdp[start_frame].y; int y = TileY(tile) * TILE_SIZE + rdp[start_frame].y;
Direction new_dir = RoadVehGetSlidingDirection(v, x, y); Direction new_dir = RoadVehGetSlidingDirection(v, x, y);
if (IsRoadVehFront(v)) { if (v->IsRoadVehFront()) {
Vehicle *u = RoadVehFindCloseTo(v, x, y, new_dir); Vehicle *u = RoadVehFindCloseTo(v, x, y, new_dir);
if (u != NULL) { if (u != NULL) {
v->cur_speed = u->First()->cur_speed; v->cur_speed = u->First()->cur_speed;
@ -1543,7 +1543,7 @@ again:
case DIAGDIR_SW: dir = TRACKDIR_RVREV_NE; break; case DIAGDIR_SW: dir = TRACKDIR_RVREV_NE; break;
} }
} else { } else {
if (IsRoadVehFront(v)) { if (v->IsRoadVehFront()) {
/* If this is the front engine, look for the right path. */ /* If this is the front engine, look for the right path. */
dir = RoadFindPathToDest(v, v->tile, (DiagDirection)(rd.x & 3)); dir = RoadFindPathToDest(v, v->tile, (DiagDirection)(rd.x & 3));
} else { } else {
@ -1562,7 +1562,7 @@ again:
int y = TileY(v->tile) * TILE_SIZE + rdp[turn_around_start_frame].y; int y = TileY(v->tile) * TILE_SIZE + rdp[turn_around_start_frame].y;
Direction new_dir = RoadVehGetSlidingDirection(v, x, y); Direction new_dir = RoadVehGetSlidingDirection(v, x, y);
if (IsRoadVehFront(v) && RoadVehFindCloseTo(v, x, y, new_dir) != NULL) return false; if (v->IsRoadVehFront() && RoadVehFindCloseTo(v, x, y, new_dir) != NULL) return false;
uint32 r = VehicleEnterTile(v, v->tile, x, y); uint32 r = VehicleEnterTile(v, v->tile, x, y);
if (HasBit(r, VETS_CANNOT_ENTER)) { if (HasBit(r, VETS_CANNOT_ENTER)) {
@ -1598,7 +1598,7 @@ again:
Direction new_dir = RoadVehGetSlidingDirection(v, x, y); Direction new_dir = RoadVehGetSlidingDirection(v, x, y);
if (IsRoadVehFront(v) && !IsInsideMM(v->state, RVSB_IN_ROAD_STOP, RVSB_IN_ROAD_STOP_END)) { if (v->IsRoadVehFront() && !IsInsideMM(v->state, RVSB_IN_ROAD_STOP, RVSB_IN_ROAD_STOP_END)) {
/* Vehicle is not in a road stop. /* Vehicle is not in a road stop.
* Check for another vehicle to overtake */ * Check for another vehicle to overtake */
RoadVehicle *u = RoadVehFindCloseTo(v, x, y, new_dir); RoadVehicle *u = RoadVehFindCloseTo(v, x, y, new_dir);
@ -1632,7 +1632,7 @@ again:
* and it's the correct type of stop (bus or truck) and the frame equals the stop frame... * and it's the correct type of stop (bus or truck) and the frame equals the stop frame...
* (the station test and stop type test ensure that other vehicles, using the road stop as * (the station test and stop type test ensure that other vehicles, using the road stop as
* a through route, do not stop) */ * a through route, do not stop) */
if (IsRoadVehFront(v) && ((IsInsideMM(v->state, RVSB_IN_ROAD_STOP, RVSB_IN_ROAD_STOP_END) && if (v->IsRoadVehFront() && ((IsInsideMM(v->state, RVSB_IN_ROAD_STOP, RVSB_IN_ROAD_STOP_END) &&
_road_veh_data_1[v->state - RVSB_IN_ROAD_STOP + (_settings_game.vehicle.road_side << RVS_DRIVE_SIDE)] == v->frame) || _road_veh_data_1[v->state - RVSB_IN_ROAD_STOP + (_settings_game.vehicle.road_side << RVS_DRIVE_SIDE)] == v->frame) ||
(IsInsideMM(v->state, RVSB_IN_DT_ROAD_STOP, RVSB_IN_DT_ROAD_STOP_END) && (IsInsideMM(v->state, RVSB_IN_DT_ROAD_STOP, RVSB_IN_DT_ROAD_STOP_END) &&
v->current_order.ShouldStopAtStation(v, GetStationIndex(v->tile)) && v->current_order.ShouldStopAtStation(v, GetStationIndex(v->tile)) &&
@ -1820,7 +1820,7 @@ bool RoadVehicle::Tick()
{ {
AgeRoadVehCargo(this); AgeRoadVehCargo(this);
if (IsRoadVehFront(this)) { if (this->IsRoadVehFront()) {
if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++; if (!(this->vehstatus & VS_STOPPED)) this->running_ticks++;
return RoadVehController(this); return RoadVehController(this);
} }
@ -1864,7 +1864,7 @@ static void CheckIfRoadVehNeedsService(RoadVehicle *v)
void RoadVehicle::OnNewDay() void RoadVehicle::OnNewDay()
{ {
if (!IsRoadVehFront(this)) return; if (!this->IsRoadVehFront()) return;
if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this); if ((++this->day_counter & 7) == 0) DecreaseVehicleValue(this);
if (this->blocked_ctr == 0) CheckVehicleBreakdown(this); if (this->blocked_ctr == 0) CheckVehicleBreakdown(this);

6
src/roadveh_gui.cpp
View File

@ -24,7 +24,9 @@
*/ */
void DrawRoadVehDetails(const Vehicle *v, int left, int right, int y) void DrawRoadVehDetails(const Vehicle *v, int left, int right, int y)
{ {
uint y_offset = RoadVehHasArticPart(v) ? 15 : 0; const RoadVehicle *rv = RoadVehicle::From(v);
uint y_offset = rv->RoadVehHasArticPart() ? 15 : 0;
StringID str; StringID str;
Money feeder_share = 0; Money feeder_share = 0;
@ -33,7 +35,7 @@ void DrawRoadVehDetails(const Vehicle *v, int left, int right, int y)
SetDParam(2, v->value); SetDParam(2, v->value);
DrawString(left, right, y + y_offset, STR_VEHICLE_INFO_BUILT_VALUE); DrawString(left, right, y + y_offset, STR_VEHICLE_INFO_BUILT_VALUE);
if (RoadVehHasArticPart(v)) { if (rv->RoadVehHasArticPart()) {
CargoArray max_cargo; CargoArray max_cargo;
StringID subtype_text[NUM_CARGO]; StringID subtype_text[NUM_CARGO];
char capacity[512]; char capacity[512];

7
src/saveload/vehicle_sl.cpp
View File

@ -314,8 +314,11 @@ void AfterLoadVehicles(bool part_of_load)
t->tcache.last_speed = t->cur_speed; // update displayed train speed t->tcache.last_speed = t->cur_speed; // update displayed train speed
TrainConsistChanged(t, false); TrainConsistChanged(t, false);
} }
} else if (v->type == VEH_ROAD && IsRoadVehFront(v)) { } else if (v->type == VEH_ROAD) {
RoadVehUpdateCache(RoadVehicle::From(v)); RoadVehicle *rv = RoadVehicle::From(v);
if (rv->IsRoadVehFront()) {
RoadVehUpdateCache(rv);
}
} }
} }

2
src/station.cpp
View File

@ -121,7 +121,7 @@ RoadStop *Station::GetPrimaryRoadStop(const RoadVehicle *v) const
/* The vehicle cannot go to this roadstop (different roadtype) */ /* The vehicle cannot go to this roadstop (different roadtype) */
if ((GetRoadTypes(rs->xy) & v->compatible_roadtypes) == ROADTYPES_NONE) continue; if ((GetRoadTypes(rs->xy) & v->compatible_roadtypes) == ROADTYPES_NONE) continue;
/* The vehicle is articulated and can therefor not go the a standard road stop */ /* The vehicle is articulated and can therefor not go the a standard road stop */
if (IsStandardRoadStopTile(rs->xy) && RoadVehHasArticPart(v)) continue; if (IsStandardRoadStopTile(rs->xy) && v->RoadVehHasArticPart()) continue;
/* The vehicle can actually go to this road stop. So, return it! */ /* The vehicle can actually go to this road stop. So, return it! */
break; break;

4
src/station_cmd.cpp
View File

@ -2542,7 +2542,7 @@ static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, i
} else if (v->type == VEH_ROAD) { } else if (v->type == VEH_ROAD) {
RoadVehicle *rv = RoadVehicle::From(v); RoadVehicle *rv = RoadVehicle::From(v);
if (rv->state < RVSB_IN_ROAD_STOP && !IsReversingRoadTrackdir((Trackdir)rv->state) && rv->frame == 0) { if (rv->state < RVSB_IN_ROAD_STOP && !IsReversingRoadTrackdir((Trackdir)rv->state) && rv->frame == 0) {
if (IsRoadStop(tile) && IsRoadVehFront(v)) { if (IsRoadStop(tile) && rv->IsRoadVehFront()) {
/* Attempt to allocate a parking bay in a road stop */ /* Attempt to allocate a parking bay in a road stop */
RoadStop *rs = RoadStop::GetByTile(tile, GetRoadStopType(tile)); RoadStop *rs = RoadStop::GetByTile(tile, GetRoadStopType(tile));
@ -2570,7 +2570,7 @@ static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, i
/* For normal (non drive-through) road stops /* For normal (non drive-through) road stops
* Check if station is busy or if there are no free bays or whether it is a articulated vehicle. */ * Check if station is busy or if there are no free bays or whether it is a articulated vehicle. */
if (rs->IsEntranceBusy() || !rs->HasFreeBay() || RoadVehHasArticPart(v)) return VETSB_CANNOT_ENTER; if (rs->IsEntranceBusy() || !rs->HasFreeBay() || rv->RoadVehHasArticPart()) return VETSB_CANNOT_ENTER;
SetBit(rv->state, RVS_IN_ROAD_STOP); SetBit(rv->state, RVS_IN_ROAD_STOP);

6
src/vehicle.cpp
View File

@ -483,7 +483,7 @@ bool IsEngineCountable(const Vehicle *v)
case VEH_TRAIN: case VEH_TRAIN:
return !Train::From(v)->IsArticulatedPart() && // tenders and other articulated parts return !Train::From(v)->IsArticulatedPart() && // tenders and other articulated parts
!Train::From(v)->IsRearDualheaded(); // rear parts of multiheaded engines !Train::From(v)->IsRearDualheaded(); // rear parts of multiheaded engines
case VEH_ROAD: return IsRoadVehFront(v); case VEH_ROAD: return RoadVehicle::From(v)->IsRoadVehFront();
case VEH_SHIP: return true; case VEH_SHIP: return true;
default: return false; // Only count company buildable vehicles default: return false; // Only count company buildable vehicles
} }
@ -603,7 +603,7 @@ void CallVehicleTicks()
case VEH_SHIP: case VEH_SHIP:
if (v->type == VEH_TRAIN && Train::From(v)->IsWagon()) continue; if (v->type == VEH_TRAIN && Train::From(v)->IsWagon()) continue;
if (v->type == VEH_AIRCRAFT && v->subtype != AIR_HELICOPTER) continue; if (v->type == VEH_AIRCRAFT && v->subtype != AIR_HELICOPTER) continue;
if (v->type == VEH_ROAD && !IsRoadVehFront(v)) continue; if (v->type == VEH_ROAD && !RoadVehicle::From(v)->IsRoadVehFront()) continue;
v->motion_counter += (v->direction & 1) ? (v->cur_speed * 3) / 4 : v->cur_speed; v->motion_counter += (v->direction & 1) ? (v->cur_speed * 3) / 4 : v->cur_speed;
/* Play a running sound if the motion counter passes 256 (Do we not skip sounds?) */ /* Play a running sound if the motion counter passes 256 (Do we not skip sounds?) */
@ -976,7 +976,7 @@ void VehicleEnterDepot(Vehicle *v)
case VEH_ROAD: case VEH_ROAD:
InvalidateWindowClasses(WC_ROADVEH_LIST); InvalidateWindowClasses(WC_ROADVEH_LIST);
if (!IsRoadVehFront(v)) v = v->First(); if (!RoadVehicle::From(v)->IsRoadVehFront()) v = v->First();
break; break;
case VEH_SHIP: case VEH_SHIP:

4
src/vehicle_cmd.cpp
View File

@ -439,7 +439,7 @@ CommandCost CmdCloneVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
if (w->type == VEH_TRAIN && Train::From(w)->EngineHasArticPart()) { if (w->type == VEH_TRAIN && Train::From(w)->EngineHasArticPart()) {
w = GetNextArticPart(Train::From(w)); w = GetNextArticPart(Train::From(w));
} else if (w->type == VEH_ROAD && RoadVehHasArticPart(w)) { } else if (w->type == VEH_ROAD && RoadVehicle::From(w)->RoadVehHasArticPart()) {
w = w->Next(); w = w->Next();
} else { } else {
break; break;
@ -455,7 +455,7 @@ CommandCost CmdCloneVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
if (v->type == VEH_TRAIN && Train::From(v)->EngineHasArticPart()) { if (v->type == VEH_TRAIN && Train::From(v)->EngineHasArticPart()) {
v = GetNextArticPart(Train::From(v)); v = GetNextArticPart(Train::From(v));
} else if (v->type == VEH_ROAD && RoadVehHasArticPart(v)) { } else if (v->type == VEH_ROAD && RoadVehicle::From(v)->RoadVehHasArticPart()) {
v = v->Next(); v = v->Next();
} else { } else {
break; break;

2
src/vehicle_gui.cpp
View File

@ -1355,7 +1355,7 @@ struct VehicleDetailsWindow : Window {
case VEH_ROAD: { case VEH_ROAD: {
this->widget[VLD_WIDGET_RENAME_VEHICLE].tooltips = STR_QUERY_RENAME_ROAD_CAPTION; this->widget[VLD_WIDGET_RENAME_VEHICLE].tooltips = STR_QUERY_RENAME_ROAD_CAPTION;
if (!RoadVehHasArticPart(v)) break; if (!RoadVehicle::From(v)->RoadVehHasArticPart()) break;
/* Draw the text under the vehicle instead of next to it, minus the /* Draw the text under the vehicle instead of next to it, minus the
* height already allocated for the cargo of the first vehicle. */ * height already allocated for the cargo of the first vehicle. */

9
src/water_cmd.cpp
View File

@ -813,11 +813,12 @@ static void FloodVehicle(Vehicle *v)
break; break;
} }
case VEH_ROAD: case VEH_ROAD: {
if (IsRoadVehFront(v)) pass += 1; // driver RoadVehicle *rv = RoadVehicle::From(v);
RoadVehicle::From(v)->crashed_ctr = 2000; // max 2220, disappear pretty fast if (rv->IsRoadVehFront()) pass += 1; // driver
rv->crashed_ctr = 2000; // max 2220, disappear pretty fast
InvalidateWindowClassesData(WC_ROADVEH_LIST, 0); InvalidateWindowClassesData(WC_ROADVEH_LIST, 0);
break; } break;
case VEH_AIRCRAFT: case VEH_AIRCRAFT:
pass += 2; // driver pass += 2; // driver