(svn r10688) -Cleanup: coding style cleanups missed in the last few cleanups.

1 files changed, 18 insertions, 21 deletions

diff --git a/src/newgrf_commons.h b/src/newgrf_commons.h
index 59283ab66..25933117e 100644
--- a/src/newgrf_commons.h
+++ b/src/newgrf_commons.h
@@ -25,8 +25,7 @@ struct EntityIDMapping {
 	uint8  substitute_id;  ///< The (original) entity ID to use if this GRF is not available
 };
 
-class OverrideManagerBase
-{
+class OverrideManagerBase {
 protected:
 	uint16 *entity_overrides;
 
@@ -50,40 +49,38 @@ public:
 	uint16 GetSubstituteID(byte entity_id);
 	uint16 GetID(uint8 grf_local_id, uint32 grfid);
 
-	inline uint16 GetMaxMapping() { return max_new_entities; };
-	inline uint16 GetMaxOffset() { return max_offset; };
+	inline uint16 GetMaxMapping() { return max_new_entities; }
+	inline uint16 GetMaxOffset() { return max_offset; }
 };
 
 
 struct HouseSpec;
-class HouseOverrideManager : public OverrideManagerBase
-{
+class HouseOverrideManager : public OverrideManagerBase {
 public:
 	HouseOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
-			OverrideManagerBase(offset, maximum, invalid) {};
+			OverrideManagerBase(offset, maximum, invalid) {}
 	void SetEntitySpec(const HouseSpec *hs);
 };
 
 
 struct IndustrySpec;
-class IndustryOverrideManager : public OverrideManagerBase
-{
-	public:
-		IndustryOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
-				OverrideManagerBase(offset, maximum, invalid) {};
-
-		virtual uint16 AddEntityID(byte grf_local_id, uint32 grfid, byte substitute_id);
-		void SetEntitySpec(const IndustrySpec *inds);
+class IndustryOverrideManager : public OverrideManagerBase {
+public:
+	IndustryOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
+			OverrideManagerBase(offset, maximum, invalid) {}
+
+	virtual uint16 AddEntityID(byte grf_local_id, uint32 grfid, byte substitute_id);
+	void SetEntitySpec(const IndustrySpec *inds);
 };
 
 
 struct IndustryTileSpec;
-class IndustryTileOverrideManager : public OverrideManagerBase
-{
-	public:
-		IndustryTileOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
-				OverrideManagerBase(offset, maximum, invalid) {};
-		void SetEntitySpec(const IndustryTileSpec *indts);
+class IndustryTileOverrideManager : public OverrideManagerBase {
+public:
+	IndustryTileOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
+			OverrideManagerBase(offset, maximum, invalid) {}
+
+	void SetEntitySpec(const IndustryTileSpec *indts);
 };
 
 extern HouseOverrideManager _house_mngr;