astyle cleanup, corrects not loading of material textures

1 files changed, 8 insertions, 5 deletions

diff --git a/src/game/base/ship.h b/src/game/base/ship.h
index 21987e7..e1b8b1d 100644
--- a/src/game/base/ship.h
+++ b/src/game/base/ship.h
@@ -1,7 +1,7 @@
 /*
    base/ship.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_SHIP_H__
@@ -14,7 +14,8 @@
 #include "base/jumppoint.h"
 #include "math/vector3f.h"
 
-namespace game {
+namespace game
+{
 
 /// A ship in the game, controled by a player
 class Ship : public core::EntityControlable, public PhysicsBody
@@ -30,7 +31,9 @@ public:
 	virtual void set_zone(core::Zone *zone);
 
 	/// true if the ship is equiped with a jumpdrive
-	inline bool jumpdrive() const { return ship_jumpdrive; }
+	inline bool jumpdrive() const {
+		return ship_jumpdrive;
+	}
 
 	/// Initiate jump, departing from a jump point
 	/** Initiates a jump even if the ship has no jumpdrive
@@ -65,7 +68,7 @@ private:
 
 	float			ship_impulsedrive_timer;
 
-	
+
 	JumpPoint		*ship_jumpdepart;
 };