Using an enum for model type

[lugaru.git] / Source / Graphic / Models.hpp

diff --git a/Source/Graphic/Models.hpp b/Source/Graphic/Models.hpp
index 3756c1ece8a77d05447e55ba047baa78d1c4ec72..54b28858ae3a7d2f2a3bcf31e347bfe7b56f11ba 100644 (file)
--- a/Source/Graphic/Models.hpp
+++ b/Source/Graphic/Models.hpp
@@ -54,19 +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;
-    bool hastexture;
 
-    int type, oldtype;
+    ModelType type;
 
     int* owner;
     XYZ* vertex;
@@ -117,7 +119,6 @@ public:
     void Translate(float xtrans, float ytrans, float ztrans);
     void CalculateNormals(bool facenormalise);
     void draw();
-    void drawdifftex(GLuint texture);
     void drawdifftex(Texture texture);
     void drawimmediate();
     void Rotate(float xang, float yang, float zang);