equal
deleted
inserted
replaced
115 case VEH_AIRCRAFT: return STR_A015_AIRCRAFT_IN_THE_WAY; |
115 case VEH_AIRCRAFT: return STR_A015_AIRCRAFT_IN_THE_WAY; |
116 default: return STR_980E_SHIP_IN_THE_WAY; |
116 default: return STR_980E_SHIP_IN_THE_WAY; |
117 } |
117 } |
118 } |
118 } |
119 |
119 |
120 static void *EnsureNoVehicleProc(Vehicle *v, void *data) |
|
121 { |
|
122 if (v->tile != *(const TileIndex*)data || v->type == VEH_DISASTER || (v->type == VEH_AIRCRAFT && v->subtype == AIR_SHADOW)) |
|
123 return NULL; |
|
124 |
|
125 _error_message = VehicleInTheWayErrMsg(v); |
|
126 return v; |
|
127 } |
|
128 |
|
129 bool EnsureNoVehicle(TileIndex tile) |
|
130 { |
|
131 return VehicleFromPos(tile, &tile, EnsureNoVehicleProc) == NULL; |
|
132 } |
|
133 |
|
134 static void *EnsureNoVehicleProcZ(Vehicle *v, void *data) |
120 static void *EnsureNoVehicleProcZ(Vehicle *v, void *data) |
135 { |
121 { |
136 const TileInfo *ti = (const TileInfo*)data; |
122 const TileInfo *ti = (const TileInfo*)data; |
137 |
123 |
138 if (v->tile != ti->tile || v->type == VEH_DISASTER || (v->type == VEH_AIRCRAFT && v->subtype == AIR_SHADOW)) return NULL; |
124 if (v->tile != ti->tile || v->type == VEH_DISASTER || (v->type == VEH_AIRCRAFT && v->subtype == AIR_SHADOW)) return NULL; |