(svn r6560) - Codechange: Minor fix; add missing #include guards and comments, and correct svn properties on bmp.[ch]

This commit is contained in:
peter1138 2006-09-28 18:42:35 +00:00
parent b49018f7b1
commit 681c8c0162
22 changed files with 41 additions and 17 deletions

View File

@ -232,4 +232,4 @@ static inline void MakeRailBridgeMiddle(TileIndex t, uint bridgetype, uint piece
}
#endif
#endif /* BRIDGE_MAP_H */

View File

@ -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 */

5
date.h
View File

@ -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 */

View File

@ -144,4 +144,4 @@ static inline bool IsValidAxis(Axis d)
return d < AXIS_END;
}
#endif
#endif /* DIRECTION_H */

View File

@ -56,4 +56,3 @@ typedef struct Livery {
} Livery;
#endif /* LIVERY_H */

View File

@ -5,4 +5,4 @@
void ShowNetworkNeedPassword(NetworkPasswordType npt);
#endif
#endif /* NETWORK_GUI_H */

View File

@ -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 */

View File

@ -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 */

2
road.h
View File

@ -23,4 +23,4 @@ static inline RoadBits DiagDirToRoadBits(DiagDirection d)
return (RoadBits)(1U << (3 ^ d));
}
#endif
#endif /* ROAD_H */

View File

@ -7,4 +7,4 @@
void DrawRoadDepotSprite(int x, int y, DiagDirection dir);
#endif
#endif /* ROAD_CMD_H */

View File

@ -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 */

View File

@ -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 */

5
ship.h
View File

@ -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 */

View File

@ -38,4 +38,4 @@ static inline Slope ComplementSlope(Slope s)
return (Slope)(0xF ^ s);
}
#endif
#endif /* SLOPE_H */

View File

@ -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 */

2
tgp.h
View File

@ -5,4 +5,4 @@
void GenerateTerrainPerlin(void);
#endif
#endif /* TGP_H */

View File

@ -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 */

View File

@ -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 */

View File

@ -5,4 +5,4 @@
void UpdateCompanyHQ(Player *p, uint score);
#endif
#endif /* UNMOVABLE_H */

View File

@ -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 */

View File

@ -15,4 +15,4 @@ static inline void MakeVoid(TileIndex t)
_m[t].extra = 0;
}
#endif
#endif /* VOID_MAP_H */

View File

@ -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 */