(svn r16661) -Codechange: move definition of few very short functions to header files

4 files changed, 29 insertions, 35 deletions

diff --git a/src/cargotype.cpp b/src/cargotype.cpp
index 7c533b527..8216fbb65 100644
--- a/src/cargotype.cpp
+++ b/src/cargotype.cpp
@@ -13,8 +13,6 @@
 
 CargoSpec _cargo[NUM_CARGO];
 
-static const byte INVALID_CARGO = 0xFF;
-
 /* Bitmask of cargo types available */
 uint32 _cargo_mask;
 
@@ -55,19 +53,6 @@ void SetupCargoForClimate(LandscapeID l)
 }
 
 
-const CargoSpec *GetCargo(CargoID c)
-{
-	assert(c < lengthof(_cargo));
-	return &_cargo[c];
-}
-
-
-bool CargoSpec::IsValid() const
-{
-	return bitnum != INVALID_CARGO;
-}
-
-
 CargoID GetCargoIDByLabel(CargoLabel cl)
 {
 	for (CargoID c = 0; c < lengthof(_cargo); c++) {
diff --git a/src/cargotype.h b/src/cargotype.h
index db1a6f0d5..da17c1ada 100644
--- a/src/cargotype.h
+++ b/src/cargotype.h
@@ -22,6 +22,8 @@ enum TownEffect {
 };
 
 
+static const byte INVALID_CARGO = 0xFF;
+
 struct CargoSpec {
 	uint8 bitnum;
 	CargoLabel label;
@@ -48,24 +50,32 @@ struct CargoSpec {
 	const struct GRFFile *grffile;   ///< NewGRF where 'group' belongs to
 	const struct SpriteGroup *group;
 
-	bool IsValid() const;
+	bool IsValid() const
+	{
+		return this->bitnum != INVALID_CARGO;
+	}
 };
 
-
 extern uint32 _cargo_mask;
 extern CargoSpec _cargo[NUM_CARGO];
 
 
 /* Set up the default cargo types for the given landscape type */
 void SetupCargoForClimate(LandscapeID l);
-/* Retrieve cargo details for the given cargo ID */
-const CargoSpec *GetCargo(CargoID c);
 /* Get the cargo icon for a given cargo ID */
 SpriteID GetCargoSprite(CargoID i);
 /* Get the cargo ID with the cargo label */
 CargoID GetCargoIDByLabel(CargoLabel cl);
 CargoID GetCargoIDByBitnum(uint8 bitnum);
 
+/* Retrieve cargo details for the given cargo ID */
+static inline const CargoSpec *GetCargo(CargoID c)
+{
+	assert(c < lengthof(_cargo));
+	return &_cargo[c];
+}
+
+
 static inline bool IsCargoInClass(CargoID c, uint16 cc)
 {
 	return (GetCargo(c)->classes & cc) != 0;
diff --git a/src/station.cpp b/src/station.cpp
index 16d72e53e..8f8e884d9 100644
--- a/src/station.cpp
+++ b/src/station.cpp
@@ -186,11 +186,6 @@ void Station::MarkTilesDirty(bool cargo_change) const
 	}
 }
 
-bool Station::TileBelongsToRailStation(TileIndex tile) const
-{
-	return IsRailwayStationTile(tile) && GetStationIndex(tile) == this->index;
-}
-
 /** Obtain the length of a platform
  * @pre tile must be a railway station tile
  * @param tile A tile that contains the platform in question
@@ -241,14 +236,6 @@ uint Station::GetPlatformLength(TileIndex tile, DiagDirection dir) const
 	return length;
 }
 
-/** Determines whether a station is a buoy only.
- * @todo Ditch this encoding of buoys
- */
-bool Station::IsBuoy() const
-{
-	return (had_vehicle_of_type & HVOT_BUOY) != 0;
-}
-
 /** Determines the catchment radius of the station
  * @return The radius
  */
diff --git a/src/station_base.h b/src/station_base.h
index 6cd60094e..266f45d19 100644
--- a/src/station_base.h
+++ b/src/station_base.h
@@ -160,16 +160,28 @@ public:
 	 * @ingroup dirty
 	 */
 	void MarkTilesDirty(bool cargo_change) const;
-	bool TileBelongsToRailStation(TileIndex tile) const;
+
 	uint GetPlatformLength(TileIndex tile, DiagDirection dir) const;
 	uint GetPlatformLength(TileIndex tile) const;
-	bool IsBuoy() const;
-
 	void RecomputeIndustriesNear();
 	static void RecomputeIndustriesNearForAll();
 
 	uint GetCatchmentRadius() const;
 
+	FORCEINLINE bool TileBelongsToRailStation(TileIndex tile) const
+	{
+		return IsRailwayStationTile(tile) && GetStationIndex(tile) == this->index;
+	}
+
+	/**
+	 * Determines whether a station is a buoy only.
+	 * @todo Ditch this encoding of buoys
+	 */
+	FORCEINLINE bool IsBuoy() const
+	{
+		return (this->had_vehicle_of_type & HVOT_BUOY) != 0;
+	}
+
 	static FORCEINLINE Station *GetByTile(TileIndex tile)
 	{
 		return Station::Get(GetStationIndex(tile));