X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FObject.hpp;h=61ba4abb30917e6f668dbe7c13f9e7c574803f4d;hb=5667984d5698eca3e5df2ed44a04ed4087fe24dd;hp=d1a86a8198c1575ffb3595fd4d501e017c4891c7;hpb=03fbcc5b5e18dbf62c48849fc8d02cd250aa744e;p=lugaru.git

diff --git a/Source/Objects/Object.hpp b/Source/Objects/Object.hpp
index d1a86a8..61ba4ab 100644
--- a/Source/Objects/Object.hpp
+++ b/Source/Objects/Object.hpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -23,10 +23,10 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "Environment/Lights.hpp"
 #include "Environment/Terrain.hpp"
-#include "Graphic/gamegl.hpp"
 #include "Graphic/Models.hpp"
 #include "Graphic/Sprite.hpp"
 #include "Graphic/Texture.hpp"
+#include "Graphic/gamegl.hpp"
 #include "Math/Frustum.hpp"
 #include "Math/XYZ.hpp"
 #include "Utils/ImageIO.hpp"
@@ -39,7 +39,8 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #define max_objects 300
 
-enum object_type {
+enum object_type
+{
     boxtype = 0,
     weirdtype = 1,
     spiketype = 2,
@@ -55,7 +56,6 @@ enum object_type {
     firetype = 13
 };
 
-
 class Object
 {
 public:
@@ -94,7 +94,7 @@ public:
     static void ComputeRadius();
     static void AddObjectsToTerrain();
     static void LoadObjectsFromFile(FILE* tfile, bool skip);
-    static void SphereCheckPossible(XYZ *p1, float radius);
+    static void SphereCheckPossible(XYZ* p1, float radius);
     static void DeleteObject(int which);
     static void MakeObject(int atype, XYZ where, float ayaw, float apitch, float ascale);
     static void Draw();
@@ -114,4 +114,3 @@ private:
 };
 
 #endif
-