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

(svn r18388) -Codechange: move entering/leaving of road stops to functions of RoadStop

Browse Source
This commit is contained in:
rubidium
2009-12-02 23:53:15 +00:00
parent edc7de7936
commit aa40d8e3ad
6 changed files with 89 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/roadstop_base.h
View File

@@ -62,6 +62,32 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
return HasBit(this->status, nr);
}
/**
* Checks whether the entrance of the road stop is occupied by a vehicle
* @return is entrance busy?
*/
FORCEINLINE bool IsEntranceBusy() const
{
return HasBit(this->status, RSSFB_ENTRY_BUSY);
}
/**
* Makes an entrance occupied or free
* @param busy if true, marks busy; free otherwise
*/
FORCEINLINE void SetEntranceBusy(bool busy)
{
SB(this->status, RSSFB_ENTRY_BUSY, 1, busy);
}
void Leave(RoadVehicle *rv);
bool Enter(RoadVehicle *rv);
RoadStop *GetNextRoadStop(const struct RoadVehicle *v) const;
static RoadStop *GetByTile(TileIndex tile, RoadStopType type);
private:
/**
* Allocates a bay
* @return the allocated bay number
@@ -98,29 +124,6 @@ struct RoadStop : RoadStopPool::PoolItem<&_roadstop_pool> {
assert(nr < RSSFB_BAY_COUNT);
SetBit(this->status, nr);
}
/**
* Checks whether the entrance of the road stop is occupied by a vehicle
* @return is entrance busy?
*/
FORCEINLINE bool IsEntranceBusy() const
{
return HasBit(this->status, RSSFB_ENTRY_BUSY);
}
/**
* Makes an entrance occupied or free
* @param busy if true, marks busy; free otherwise
*/
FORCEINLINE void SetEntranceBusy(bool busy)
{
SB(this->status, RSSFB_ENTRY_BUSY, 1, busy);
}
RoadStop *GetNextRoadStop(const struct RoadVehicle *v) const;
static RoadStop *GetByTile(TileIndex tile, RoadStopType type);
};
#define FOR_ALL_ROADSTOPS_FROM(var, start) FOR_ALL_ITEMS_FROM(RoadStop, roadstop_index, var, start)