X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FModels.hpp;h=54b28858ae3a7d2f2a3bcf31e347bfe7b56f11ba;hb=8b8230c564e1f0063b381e77bf6222af9f2e678d;hp=3756c1ece8a77d05447e55ba047baa78d1c4ec72;hpb=03fbcc5b5e18dbf62c48849fc8d02cd250aa744e;p=lugaru.git

diff --git a/Source/Graphic/Models.hpp b/Source/Graphic/Models.hpp
index 3756c1e..54b2885 100644
--- 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);