From: Côme Chilliet Date: Wed, 4 Jan 2017 14:00:42 +0000 (+0100) Subject: Using an enum for model type X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=8b8230c564e1f0063b381e77bf6222af9f2e678d;p=lugaru.git Using an enum for model type --- 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;