From 8b8230c564e1f0063b381e77bf6222af9f2e678d Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=B4me=20Chilliet?= <come@chilliet.eu>
Date: Wed, 4 Jan 2017 15:00:42 +0100
Subject: [PATCH] Using an enum for model type

---
 Source/Graphic/Models.cpp | 16 ++++++----------
 Source/Graphic/Models.hpp | 15 +++++++++------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Source/Graphic/Models.cpp b/Source/Graphic/Models.cpp
index d414dbd..c58e691 100644
--- a/Source/Graphic/Models.cpp
+++ b/Source/Graphic/Models.cpp
@@ -1178,19 +1178,15 @@ void Model::deallocate()
 
 Model::Model()
   : vertexNum(0),
-    type(0),
+    type(nothing),
     owner(0),
     vertex(0),
     normals(0),
-    vArray(0)
+    vArray(0),
+    color(0),
+    boundingspherecenter(),
+    boundingsphereradius(0),
+    flat(false)
 {
     memset(&modelTexture, 0, sizeof(modelTexture));
-    color = 0;
-
-    boundingspherecenter = 0;
-    boundingsphereradius = 0;
-
-    flat = 0;
-
-    type = nothing;
 }
diff --git a/Source/Graphic/Models.hpp b/Source/Graphic/Models.hpp
index eb4ef09..54b2885 100644
--- a/Source/Graphic/Models.hpp
+++ b/Source/Graphic/Models.hpp
@@ -54,18 +54,21 @@ public:
 
 #define max_model_decals 300
 
-#define nothing 0
-#define normaltype 4
-#define notextype 1
-#define rawtype 2
-#define decalstype 3
+enum ModelType
+{
+    nothing = 0,
+    notextype = 1,
+    rawtype = 2,
+    decalstype = 3,
+    normaltype = 4
+};
 
 class Model
 {
 public:
     short vertexNum;
 
-    int type;
+    ModelType type;
 
     int* owner;
     XYZ* vertex;
-- 
2.39.5