Using an enum for model type

diff --git a/Source/Graphic/Models.cpp b/Source/Graphic/Models.cpp
index d414dbde0f343b70a19c18bc7e2c80bdb39d538d..c58e6910d82a14ee8b94ef9bb0d352692395d20a 100644 (file)
--- a/Source/Graphic/Models.cpp
+++ b/Source/Graphic/Models.cpp
@@ -1178,19 +1178,15 @@ void Model::deallocate()
 
 Model::Model()
   : vertexNum(0),
 
 Model::Model()
   : vertexNum(0),

-    type(0),
+    type(nothing),

     owner(0),
     vertex(0),
     normals(0),
     owner(0),
     vertex(0),
     normals(0),

-    vArray(0)
+    vArray(0),
+    color(0),
+    boundingspherecenter(),
+    boundingsphereradius(0),
+    flat(false)

 {
     memset(&modelTexture, 0, sizeof(modelTexture));
 {
     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 eb4ef0909383af7d88045a987644504be07fc186..54b28858ae3a7d2f2a3bcf31e347bfe7b56f11ba 100644 (file)
--- a/Source/Graphic/Models.hpp
+++ b/Source/Graphic/Models.hpp
@@ -54,18 +54,21 @@ public:
 
 #define max_model_decals 300
 
 
 #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;
 
 
 class Model
 {
 public:
     short vertexNum;
 

-    int type;
+    ModelType type;

 
     int* owner;
     XYZ* vertex;
 
     int* owner;
     XYZ* vertex;