From f030154fe727e25a2afe1f78b3998c2d2dba95e4 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 18 Aug 2009 09:24:15 +0000
Subject: astyle cleanup, corrects not loading of material textures

---
 src/game/base/shipmodel.h | 63 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 18 deletions(-)

(limited to 'src/game/base/shipmodel.h')

diff --git a/src/game/base/shipmodel.h b/src/game/base/shipmodel.h
index 9bdf4f5..0cfe87e 100644
--- a/src/game/base/shipmodel.h
+++ b/src/game/base/shipmodel.h
@@ -1,7 +1,7 @@
 /*
    base/shipmodel.h
-   This file is part of the Osirion project and is distributed under 
-   the terms and conditions of the GNU General Public License version 2 
+   This file is part of the Osirion project and is distributed under
+   the terms and conditions of the GNU General Public License version 2
 */
 
 #ifndef __INCLUDED_BASE_SHIPMODEL_H__
@@ -12,7 +12,8 @@
 
 #include "core/info.h"
 
-namespace game {
+namespace game
+{
 
 /// ship model specifications
 class ShipModel
@@ -24,43 +25,69 @@ public:
 	void print();
 
 	/// acceleration
-	inline const float acceleration() const { return shipmodel_acceleration; }
+	inline const float acceleration() const {
+		return shipmodel_acceleration;
+	}
 
 	/// maximum speed
-	inline const float maxspeed() const { return shipmodel_maxspeed; }
-	
+	inline const float maxspeed() const {
+		return shipmodel_maxspeed;
+	}
+
 	/// turn speed in rotations per second
-	inline const float turnspeed() const { return shipmodel_turnspeed; }
+	inline const float turnspeed() const {
+		return shipmodel_turnspeed;
+	}
 
 	/// label of the ship model
-	inline const std::string &label() const { return shipmodel_label; }
+	inline const std::string &label() const {
+		return shipmodel_label;
+	}
 
 	/// name of the ship model
-	inline const std::string & name() const { return shipmodel_name; }
+	inline const std::string & name() const {
+		return shipmodel_name;
+	}
 
 	/// name of the model of the ship
-	inline const std::string & modelname() const { return shipmodel_modelname; }
+	inline const std::string & modelname() const {
+		return shipmodel_modelname;
+	}
 
 	/// price of the ship
-	inline const long price() const { return shipmodel_price; }
+	inline const long price() const {
+		return shipmodel_price;
+	}
 
 	/// size of the cargo hold
-	inline const float maxcargo() const { return shipmodel_maxcargo; }
+	inline const float maxcargo() const {
+		return shipmodel_maxcargo;
+	}
 
 	/// set acceleration
-	inline void set_acceleration(const float acceleration) { shipmodel_acceleration = acceleration; }
+	inline void set_acceleration(const float acceleration) {
+		shipmodel_acceleration = acceleration;
+	}
 
 	/// set maximum speed
-	inline void set_maxspeed(const float maxspeed) { shipmodel_maxspeed = maxspeed; }
+	inline void set_maxspeed(const float maxspeed) {
+		shipmodel_maxspeed = maxspeed;
+	}
 
 	/// set turn speed
-	inline void set_turnspeed(const float turnspeed) { shipmodel_turnspeed = turnspeed; }
+	inline void set_turnspeed(const float turnspeed) {
+		shipmodel_turnspeed = turnspeed;
+	}
 
 	/// set price
-	inline void set_price(const long price) { shipmodel_price = price; }
+	inline void set_price(const long price) {
+		shipmodel_price = price;
+	}
 
 	/// set size of the cargo hold
-	inline void set_maxcargo(const float maxcargo) { shipmodel_maxcargo = maxcargo; }
+	inline void set_maxcargo(const float maxcargo) {
+		shipmodel_maxcargo = maxcargo;
+	}
 
 	/// generate an info object for this shipmodel
 	void generate_info(core::Info *info);
@@ -108,7 +135,7 @@ private:
 	float			shipmodel_maxcargo;
 
 	long			shipmodel_price;
-	
+
 };
 
 }
-- 
cgit v1.2.3