Daniele Bartolini 10 gadi atpakaļ
vecāks
revīzija
b11b1160e2

+ 1 - 4
src/world/debug_line.h

@@ -50,10 +50,7 @@ struct DebugLine
 
 	/// Default number of segments.
 	static const uint32_t NUM_SEGMENTS = 36;
-
-public:
-
-	enum { MARKER = 0xd7c17715 };
+	static const uint32_t MARKER = 0xd7c17715;
 
 private:
 

+ 1 - 3
src/world/level.h

@@ -25,9 +25,7 @@ public:
 
 	void load(const Vector3& pos, const Quaternion& rot);
 
-public:
-
-	enum { MARKER = 0x1f2b43fe };
+	static const uint32_t MARKER = 0x1f2b43fe;
 
 private:
 

+ 1 - 3
src/world/render_world.h

@@ -116,9 +116,7 @@ public:
 	bool is_valid(SpriteInstance i) { return i.i != UINT32_MAX; }
 	bool is_valid(LightInstance i) { return i.i != UINT32_MAX; }
 
-public:
-
-	enum { MARKER = 0xc82277de };
+	static const uint32_t MARKER = 0xc82277de;
 
 private:
 

+ 1 - 3
src/world/scene_graph.h

@@ -83,9 +83,7 @@ struct SceneGraph
 
 	void transform(const Matrix4x4& parent, TransformInstance i);
 
-public:
-
-	enum { MARKER = 0x63a44dbf };
+	static const uint32_t MARKER = 0x63a44dbf;
 
 private:
 

+ 1 - 3
src/world/world.h

@@ -163,9 +163,7 @@ public:
 	/// Returns the sound sub-world.
 	SoundWorld* sound_world();
 
-public:
-
-	enum { MARKER = 0xfb6ce2d3 };
+	static const uint32_t MARKER = 0xfb6ce2d3;
 
 private: