diff options
| author | smatz <smatz@openttd.org> | 2009-05-26 22:45:48 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-05-26 22:45:48 +0000 |
| commit | 5a463c8347fe1e68ab31dda1425e9060d52bfbd6 (patch) | |
| tree | 55f5c9de8dcbda6268d003b29af59650594ce27a /src/roadveh_cmd.cpp | |
| parent | 7ee882d03f4c41d8659ed82fd5be0d0efbae0a0c (diff) | |
| download | openttd-5a463c8347fe1e68ab31dda1425e9060d52bfbd6.tar.xz | |
(svn r16442) -Codechange: use new Vehicle accessors at more places
Diffstat (limited to 'src/roadveh_cmd.cpp')
| -rw-r--r-- | src/roadveh_cmd.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index e78b69275..959fdfffb 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -312,8 +312,8 @@ bool RoadVehicle::IsStoppedInDepot() const */ CommandCost CmdSellRoadVeh(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) { - Vehicle *v = Vehicle::GetIfValid(p1); - if (v == NULL || v->type != VEH_ROAD || !CheckOwnership(v->owner)) return CMD_ERROR; + RoadVehicle *v = RoadVehicle::GetIfValid(p1); + if (v == NULL || !CheckOwnership(v->owner)) return CMD_ERROR; if (HASBITS(v->vehstatus, VS_CRASHED)) return_cmd_error(STR_CAN_T_SELL_DESTROYED_VEHICLE); @@ -418,8 +418,8 @@ CommandCost CmdSendRoadVehToDepot(TileIndex tile, DoCommandFlag flags, uint32 p1 return SendAllVehiclesToDepot(VEH_ROAD, flags, p2 & DEPOT_SERVICE, _current_company, (p2 & VLW_MASK), p1); } - Vehicle *v = Vehicle::GetIfValid(p1); - if (v == NULL || v->type != VEH_ROAD) return CMD_ERROR; + RoadVehicle *v = RoadVehicle::GetIfValid(p1); + if (v == NULL) return CMD_ERROR; return v->SendToDepot(flags, (DepotCommand)(p2 & DEPOT_COMMAND_MASK)); } @@ -1991,9 +1991,9 @@ CommandCost CmdRefitRoadVeh(TileIndex tile, DoCommandFlag flags, uint32 p1, uint uint16 capacity = CALLBACK_FAILED; uint total_capacity = 0; - Vehicle *v = Vehicle::GetIfValid(p1); + RoadVehicle *v = RoadVehicle::GetIfValid(p1); - if (v == NULL || v->type != VEH_ROAD || !CheckOwnership(v->owner)) return CMD_ERROR; + if (v == NULL || !CheckOwnership(v->owner)) return CMD_ERROR; if (!v->IsStoppedInDepot()) return_cmd_error(STR_ERROR_ROAD_MUST_BE_STOPPED_INSIDE_DEPOT); if (v->vehstatus & VS_CRASHED) return_cmd_error(STR_CAN_T_REFIT_DESTROYED_VEHICLE); |