diff options
-rw-r--r-- | bridge_map.h | 2 | ||||
-rw-r--r-- | clear_map.h | 2 | ||||
-rw-r--r-- | date.h | 5 | ||||
-rw-r--r-- | direction.h | 2 | ||||
-rw-r--r-- | livery.h | 1 | ||||
-rw-r--r-- | network_gui.h | 2 | ||||
-rw-r--r-- | rail_map.h | 2 | ||||
-rw-r--r-- | railtypes.h | 5 | ||||
-rw-r--r-- | road.h | 2 | ||||
-rw-r--r-- | road_cmd.h | 2 | ||||
-rw-r--r-- | road_map.h | 2 | ||||
-rw-r--r-- | roadveh.h | 5 | ||||
-rw-r--r-- | ship.h | 5 | ||||
-rw-r--r-- | slope.h | 2 | ||||
-rw-r--r-- | station_map.h | 2 | ||||
-rw-r--r-- | tgp.h | 2 | ||||
-rw-r--r-- | tree_map.h | 2 | ||||
-rw-r--r-- | tunnel_map.h | 2 | ||||
-rw-r--r-- | unmovable.h | 2 | ||||
-rw-r--r-- | unmovable_map.h | 5 | ||||
-rw-r--r-- | void_map.h | 2 | ||||
-rw-r--r-- | water_map.h | 2 |
22 files changed, 41 insertions, 17 deletions
diff --git a/bridge_map.h b/bridge_map.h index 89f4417b7..4547c9dbb 100644 --- a/bridge_map.h +++ b/bridge_map.h @@ -232,4 +232,4 @@ static inline void MakeRailBridgeMiddle(TileIndex t, uint bridgetype, uint piece } -#endif +#endif /* BRIDGE_MAP_H */ diff --git a/clear_map.h b/clear_map.h index 8dfed21ce..50ae63b1b 100644 --- a/clear_map.h +++ b/clear_map.h @@ -142,4 +142,4 @@ static inline void MakeField(TileIndex t, uint field_type, uint16 industry) SetClearGroundDensity(t, CLEAR_FIELDS, 3); } -#endif +#endif /* CLEAR_MAP_H */ @@ -1,5 +1,8 @@ /* $Id$ */ +#ifndef DATE_H +#define DATE_H + /** * 1 day is 74 ticks; _date_fract used to be uint16 and incremented by 885. On * an overflow the new day begun and 65535 / 885 = 74. @@ -52,3 +55,5 @@ extern DateFract _date_fract; void SetDate(Date date); void ConvertDateToYMD(Date date, YearMonthDay *ymd); Date ConvertYMDToDate(Year year, Month month, Day day); + +#endif /* DATE_H */ diff --git a/direction.h b/direction.h index ca9cf34dd..477c34046 100644 --- a/direction.h +++ b/direction.h @@ -144,4 +144,4 @@ static inline bool IsValidAxis(Axis d) return d < AXIS_END; } -#endif +#endif /* DIRECTION_H */ @@ -56,4 +56,3 @@ typedef struct Livery { } Livery; #endif /* LIVERY_H */ - diff --git a/network_gui.h b/network_gui.h index 521ebc524..e0aee1cb7 100644 --- a/network_gui.h +++ b/network_gui.h @@ -5,4 +5,4 @@ void ShowNetworkNeedPassword(NetworkPasswordType npt); -#endif +#endif /* NETWORK_GUI_H */ diff --git a/rail_map.h b/rail_map.h index 2755940c0..c3bfc9681 100644 --- a/rail_map.h +++ b/rail_map.h @@ -349,4 +349,4 @@ static inline void MakeRailWaypoint(TileIndex t, Owner o, Axis a, RailType r, ui _m[t].m5 = RAIL_TILE_DEPOT_WAYPOINT | RAIL_SUBTYPE_WAYPOINT | a; } -#endif +#endif /* RAIL_MAP_H */ diff --git a/railtypes.h b/railtypes.h index be2ff2907..e21c1250d 100644 --- a/railtypes.h +++ b/railtypes.h @@ -1,5 +1,8 @@ /* $Id$ */ +#ifndef RAILTYPES_H +#define RAILTYPES_H + /** @file railtypes.h * All the railtype-specific information is stored here. */ @@ -207,3 +210,5 @@ RailtypeInfo _railtypes[] = { 2, }, }; + +#endif /* RAILTYPES_H */ @@ -23,4 +23,4 @@ static inline RoadBits DiagDirToRoadBits(DiagDirection d) return (RoadBits)(1U << (3 ^ d)); } -#endif +#endif /* ROAD_H */ diff --git a/road_cmd.h b/road_cmd.h index aeda82db1..436ecd900 100644 --- a/road_cmd.h +++ b/road_cmd.h @@ -7,4 +7,4 @@ void DrawRoadDepotSprite(int x, int y, DiagDirection dir); -#endif +#endif /* ROAD_CMD_H */ diff --git a/road_map.h b/road_map.h index 9ec26da61..07670f97c 100644 --- a/road_map.h +++ b/road_map.h @@ -210,4 +210,4 @@ static inline void MakeRoadDepot(TileIndex t, Owner owner, DiagDirection dir) _m[t].m5 = ROAD_TILE_DEPOT << 4 | dir; } -#endif +#endif /* ROAD_MAP_H */ @@ -1,5 +1,8 @@ /* $Id$ */ +#ifndef ROADVEH_H +#define ROADVEH_H + #include "vehicle.h" @@ -15,3 +18,5 @@ static inline bool IsRoadVehInDepotStopped(const Vehicle* v) } void CcCloneRoadVeh(bool success, TileIndex tile, uint32 p1, uint32 p2); + +#endif /* ROADVEH_H */ @@ -1,5 +1,8 @@ /* $Id$ */ +#ifndef SHIP_H +#define SHIP_H + #include "vehicle.h" void CcCloneShip(bool success, TileIndex tile, uint32 p1, uint32 p2); @@ -14,3 +17,5 @@ static inline bool IsShipInDepotStopped(const Vehicle* v) { return IsShipInDepot(v) && v->vehstatus & VS_STOPPED; } + +#endif /* SHIP_H */ @@ -38,4 +38,4 @@ static inline Slope ComplementSlope(Slope s) return (Slope)(0xF ^ s); } -#endif +#endif /* SLOPE_H */ diff --git a/station_map.h b/station_map.h index 912cfc572..c52769b14 100644 --- a/station_map.h +++ b/station_map.h @@ -301,4 +301,4 @@ static inline void MakeOilrig(TileIndex t, StationID sid) MakeStation(t, OWNER_NONE, sid, GFX_OILRIG_BASE); } -#endif +#endif /* STATION_MAP_H */ @@ -5,4 +5,4 @@ void GenerateTerrainPerlin(void); -#endif +#endif /* TGP_H */ diff --git a/tree_map.h b/tree_map.h index de952b50f..326504659 100644 --- a/tree_map.h +++ b/tree_map.h @@ -128,4 +128,4 @@ static inline void MakeTree(TileIndex t, TreeType type, uint count, uint growth, _m[t].m5 = count << 6 | growth; } -#endif +#endif /* TREE_MAP_H */ diff --git a/tunnel_map.h b/tunnel_map.h index 67c1fa94f..9ad54d07e 100644 --- a/tunnel_map.h +++ b/tunnel_map.h @@ -60,4 +60,4 @@ static inline void MakeRailTunnel(TileIndex t, Owner o, DiagDirection d, RailTyp _m[t].m5 = TRANSPORT_RAIL << 2 | d; } -#endif +#endif /* TUNNEL_MAP_H */ diff --git a/unmovable.h b/unmovable.h index 9e3ce473a..d7483aa6e 100644 --- a/unmovable.h +++ b/unmovable.h @@ -5,4 +5,4 @@ void UpdateCompanyHQ(Player *p, uint score); -#endif +#endif /* UNMOVABLE_H */ diff --git a/unmovable_map.h b/unmovable_map.h index 5fa62a441..d016a7ac1 100644 --- a/unmovable_map.h +++ b/unmovable_map.h @@ -1,5 +1,8 @@ /* $Id$ */ +#ifndef UNMOVABLE_MAP_H +#define UNMOVABLE_MAP_H + enum { HQ_NUM_TILE = 4, HQ_NUM_SIZE = 5 @@ -114,3 +117,5 @@ static inline void MakeCompanyHQ(TileIndex t, Owner o) MakeUnmovable(t + TileDiffXY(1, 0), UNMOVABLE_HQ_EAST, o); MakeUnmovable(t + TileDiffXY(1, 1), UNMOVABLE_HQ_SOUTH, o); } + +#endif /* UNMOVABLE_MAP_H */ diff --git a/void_map.h b/void_map.h index f1fe9b6fd..552a8c705 100644 --- a/void_map.h +++ b/void_map.h @@ -15,4 +15,4 @@ static inline void MakeVoid(TileIndex t) _m[t].extra = 0; } -#endif +#endif /* VOID_MAP_H */ diff --git a/water_map.h b/water_map.h index e449c104d..db3308cbf 100644 --- a/water_map.h +++ b/water_map.h @@ -139,4 +139,4 @@ static inline void MakeLock(TileIndex t, Owner o, DiagDirection d) MakeLockTile(t + delta, o, LOCK_UPPER + d); } -#endif +#endif /* WATER_MAP_H */ |