diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/roadveh_cmd.cpp | 4 | ||||
| -rw-r--r-- | src/station.cpp | 17 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/roadveh_cmd.cpp b/src/roadveh_cmd.cpp index 82b8b3bc8..99ed70c78 100644 --- a/src/roadveh_cmd.cpp +++ b/src/roadveh_cmd.cpp @@ -519,7 +519,7 @@ static void ClearCrashedStation(Vehicle *v) rs->SetEntranceBusy(false); /* Free the parking bay */ - rs->FreeBay(HASBIT(v->u.road.state, RVS_USING_SECOND_BAY) ? 1 : 0); + rs->FreeBay(HASBIT(v->u.road.state, RVS_USING_SECOND_BAY)); } static void RoadVehDelete(Vehicle *v) @@ -1437,7 +1437,7 @@ again: RoadStop *rs = GetRoadStopByTile(v->tile, GetRoadStopType(v->tile)); /* Vehicle is leaving a road stop tile, mark bay as free and clear the usage bit */ - rs->FreeBay(HASBIT(v->u.road.state, RVS_USING_SECOND_BAY) ? 1 : 0); + rs->FreeBay(HASBIT(v->u.road.state, RVS_USING_SECOND_BAY)); rs->SetEntranceBusy(false); } } diff --git a/src/station.cpp b/src/station.cpp index e6e68631d..ec8be930a 100644 --- a/src/station.cpp +++ b/src/station.cpp @@ -509,17 +509,14 @@ bool RoadStop::HasFreeBay() const */ uint RoadStop::AllocateBay() { + assert(HasFreeBay()); + /* Find the first free bay. If the bit is set, the bay is free. */ - for (uint bay_nr = 0; bay_nr < MAX_BAY_COUNT; bay_nr++) { - if (HASBIT(status, bay_nr)) { - CLRBIT(status, bay_nr); - return bay_nr; - } - } + uint bay_nr = 0; + while (!HASBIT(status, bay_nr)) bay_nr++; - /* There has to be a free bay (precondition) */ - NOT_REACHED(); - return 0; + CLRBIT(status, bay_nr); + return bay_nr; } /** @@ -542,5 +539,5 @@ bool RoadStop::IsEntranceBusy() const /** Makes an entrance occupied or free */ void RoadStop::SetEntranceBusy(bool busy) { - SB(status, 7, 1, !!busy); + SB(status, 7, 1, busy); } |