]> git.jsancho.org Git - lugaru.git/blobdiff - Source/Objects/Object.hpp
clang-format: Apply to all headers
[lugaru.git] / Source / Objects / Object.hpp
index d8ce273faeff31b2636844b9c175ac6c1129f8af..61ba4abb30917e6f668dbe7c13f9e7c574803f4d 100644 (file)
@@ -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(XYZp1, 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
-