dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16442) -Codechange: use new Vehicle accessors at more places

Browse Source
This commit is contained in:
smatz
2009-05-26 22:45:48 +00:00
parent 0c53f04c07
commit e419fe6d3f
16 changed files with 127 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/road_cmd.cpp
View File

@@ -37,11 +37,9 @@
*/
bool RoadVehiclesAreBuilt()
{
const Vehicle *v;
const RoadVehicle *rv;
FOR_ALL_ROADVEHICLES(rv) return true;
FOR_ALL_VEHICLES(v) {
if (v->type == VEH_ROAD) return true;
}
return false;
}
@@ -274,9 +272,9 @@ static CommandCost RemoveRoad(TileIndex tile, DoCommandFlag flags, RoadBits piec
if (HasRoadWorks(tile)) {
/* flooding tile with road works, don't forget to remove the effect vehicle too */
assert(_current_company == OWNER_WATER);
Vehicle *v;
FOR_ALL_VEHICLES(v) {
if (v->type == VEH_EFFECT && TileVirtXY(v->x_pos, v->y_pos) == tile) {
EffectVehicle *v;
FOR_ALL_EFFECTVEHICLES(v) {
if (TileVirtXY(v->x_pos, v->y_pos) == tile) {
delete v;
}
}
@@ -1540,13 +1538,6 @@ static const byte _roadveh_enter_depot_dir[4] = {
static VehicleEnterTileStatus VehicleEnter_Road(Vehicle *v, TileIndex tile, int x, int y)
{
switch (GetRoadTileType(tile)) {
case ROAD_TILE_CROSSING:
if (v->type == VEH_TRAIN) {
/* it should be barred */
assert(IsCrossingBarred(tile));
}
break;
case ROAD_TILE_DEPOT: {
if (v->type != VEH_ROAD) break;