From 66bbf336c6af7353ef0aeed58002c46543b30635 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 2 Jan 2007 19:19:48 +0000 Subject: (svn r7759) -Merge: makefile rewrite. This merge features: - A proper ./configure, so everything needs to be configured only once, not for every make. - Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies. - A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC. - Proper support for OSX universal binaries. - Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files. - Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files. Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy. --- src/waypoint.h | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 src/waypoint.h (limited to 'src/waypoint.h') diff --git a/src/waypoint.h b/src/waypoint.h new file mode 100644 index 000000000..75366fb18 --- /dev/null +++ b/src/waypoint.h @@ -0,0 +1,73 @@ +/* $Id$ */ + +#ifndef WAYPOINT_H +#define WAYPOINT_H + +#include "oldpool.h" +#include "rail_map.h" + +struct Waypoint { + TileIndex xy; ///< Tile of waypoint + WaypointID index; ///< Index of waypoint + + TownID town_index; ///< Town associated with the waypoint + byte town_cn; ///< The Nth waypoint for this town (consecutive number) + StringID string; ///< If this is zero (i.e. no custom name), town + town_cn is used for naming + + ViewportSign sign; ///< Dimensions of sign (not saved) + Date build_date; ///< Date of construction + + byte stat_id; ///< ID of waypoint within the waypoint class (not saved) + uint32 grfid; ///< ID of GRF file + byte localidx; ///< Index of station within GRF file + + byte deleted; ///< Delete counter. If greater than 0 then it is decremented until it reaches 0; the waypoint is then is deleted. +}; + +DECLARE_OLD_POOL(Waypoint, Waypoint, 3, 8000) + +/** + * Check if a Waypoint really exists. + */ +static inline bool IsValidWaypoint(const Waypoint *wp) +{ + return wp->xy != 0; +} + +static inline bool IsValidWaypointID(WaypointID index) +{ + return index < GetWaypointPoolSize() && IsValidWaypoint(GetWaypoint(index)); +} + +void DestroyWaypoint(Waypoint *wp); + +static inline void DeleteWaypoint(Waypoint *wp) +{ + DestroyWaypoint(wp); + wp->xy = 0; +} + +#define FOR_ALL_WAYPOINTS_FROM(wp, start) for (wp = GetWaypoint(start); wp != NULL; wp = (wp->index + 1U < GetWaypointPoolSize()) ? GetWaypoint(wp->index + 1U) : NULL) if (IsValidWaypoint(wp)) +#define FOR_ALL_WAYPOINTS(wp) FOR_ALL_WAYPOINTS_FROM(wp, 0) + + +/** + * Fetch a waypoint by tile + * @param tile Tile of waypoint + * @return Waypoint + */ +static inline Waypoint *GetWaypointByTile(TileIndex tile) +{ + assert(IsTileType(tile, MP_RAILWAY) && IsRailWaypoint(tile)); + return GetWaypoint(_m[tile].m2); +} + +int32 RemoveTrainWaypoint(TileIndex tile, uint32 flags, bool justremove); +Station *ComposeWaypointStation(TileIndex tile); +void ShowRenameWaypointWindow(const Waypoint *cp); +void DrawWaypointSprite(int x, int y, int image, RailType railtype); +void FixOldWaypoints(void); +void UpdateAllWaypointSigns(void); +void AfterLoadWaypoints(void); + +#endif /* WAYPOINT_H */ -- cgit v1.2.3-54-g00ecf