mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r8514) -Codechange: Turn IsBuoy into a method of stations

release/0.6
celestar 2007-02-01 16:48:38 +00:00
parent 33cadd5043
commit 5678febfe2
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/order_cmd.cpp
View File

@ -198,7 +198,7 @@ int32 CmdInsertOrder(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (!IsValidStationID(new_order.dest)) return CMD_ERROR; if (!IsValidStationID(new_order.dest)) return CMD_ERROR;
st = GetStation(new_order.dest); st = GetStation(new_order.dest);
if (st->airport_type != AT_OILRIG && !IsBuoy(st) && !CheckOwnership(st->owner)) { if (st->airport_type != AT_OILRIG && !st->IsBuoy() && !CheckOwnership(st->owner)) {
return CMD_ERROR; return CMD_ERROR;
} }

8
src/station.cpp
View File

@ -179,6 +179,14 @@ bool Station::TileBelongsToRailStation(TileIndex tile) const
} }
/** Determines whether a station is a buoy only.
* @todo Ditch this encoding of buoys
*/
bool Station::IsBuoy() const
{
return (this->had_vehicle_of_type & HVOT_BUOY) != 0;
}
/************************************************************************/ /************************************************************************/
/* StationRect implementation */ /* StationRect implementation */

6
src/station.h
View File

@ -161,6 +161,7 @@ struct Station {
void MarkDirty() const; void MarkDirty() const;
void MarkTilesDirty() const; void MarkTilesDirty() const;
bool TileBelongsToRailStation(TileIndex tile) const; bool TileBelongsToRailStation(TileIndex tile) const;
bool IsBuoy() const;
protected: protected:
static Station *AllocateRaw(void); static Station *AllocateRaw(void);
@ -272,11 +273,6 @@ uint GetNumRoadStops(const Station* st, RoadStop::Type type);
RoadStop * AllocateRoadStop( void ); RoadStop * AllocateRoadStop( void );
void ClearSlot(Vehicle *v); void ClearSlot(Vehicle *v);
static inline bool IsBuoy(const Station* st)
{
return (st->had_vehicle_of_type & HVOT_BUOY) != 0; /* XXX: We should really ditch this ugly coding and switch to something sane... */
}
void DeleteOilRig(TileIndex t); void DeleteOilRig(TileIndex t);
#endif /* STATION_H */ #endif /* STATION_H */

4
src/station_cmd.cpp
View File

@ -541,7 +541,7 @@ static void UpdateStationAcceptance(Station *st, bool show_msg)
rect.min_y = MapSizeY(); rect.min_y = MapSizeY();
rect.max_x = rect.max_y = 0; rect.max_x = rect.max_y = 0;
// Don't update acceptance for a buoy // Don't update acceptance for a buoy
if (IsBuoy(st)) return; if (st->IsBuoy()) return;
/* old accepted goods types */ /* old accepted goods types */
old_acc = GetAcceptanceMask(st); old_acc = GetAcceptanceMask(st);
@ -2545,7 +2545,7 @@ uint MoveGoodsToStation(TileIndex tile, int w, int h, int type, uint amount)
for (i = 0; i != lengthof(around); i++) { for (i = 0; i != lengthof(around); i++) {
if (around[i] == NULL) { if (around[i] == NULL) {
if (!IsBuoy(st) && if (!st->IsBuoy() &&
(st->town->exclusive_counter == 0 || st->town->exclusivity == st->owner) && // check exclusive transport rights (st->town->exclusive_counter == 0 || st->town->exclusivity == st->owner) && // check exclusive transport rights
st->goods[type].rating != 0 && st->goods[type].rating != 0 &&
(!_patches.selectgoods || st->goods[type].last_speed > 0) && // if last_speed is 0, no vehicle has been there. (!_patches.selectgoods || st->goods[type].last_speed > 0) && // if last_speed is 0, no vehicle has been there.

2
src/vehicle_gui.cpp
View File

@ -939,7 +939,7 @@ static void DrawSmallOrderList(const Vehicle *v, int x, int y)
sel--; sel--;
if (order->type == OT_GOTO_STATION) { if (order->type == OT_GOTO_STATION) {
if (v->type == VEH_Ship && IsBuoy(GetStation(order->dest))) continue; if (v->type == VEH_Ship && GetStation(order->dest)->IsBuoy()) continue;
SetDParam(0, order->dest); SetDParam(0, order->dest);
DrawString(x, y, STR_A036, 0); DrawString(x, y, STR_A036, 0);