X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGraphic%2FModels.cpp;h=4120864b74146e015f0b4830462cfc40e908a759;hb=b32cd80b243d77cd80e026c7ae73e33ec39b1de9;hp=38e2447085c528abba18ce2dfe35c2d77332f4bc;hpb=c799187c29525d8dfcbcc7f5b911f5dd7be9b77f;p=lugaru.git diff --git a/Source/Graphic/Models.cpp b/Source/Graphic/Models.cpp index 38e2447..4120864 100644 --- a/Source/Graphic/Models.cpp +++ b/Source/Graphic/Models.cpp @@ -30,8 +30,6 @@ extern float fadestart; extern float texdetail; extern bool decals; -extern bool visibleloading; - int Model::LineCheck(XYZ *p1, XYZ *p2, XYZ *p, XYZ *move, float *rotate) { static int j; @@ -474,8 +472,7 @@ bool Model::load(const std::string& filename, bool texture ) LOG(std::string("Loading model...") + filename); - if (visibleloading) - Game::LoadingScreen(); + Game::LoadingScreen(); type = normaltype; color = 0; @@ -819,8 +816,7 @@ void Model::Rotate(float xang, float yang, float zang) void Model::CalculateNormals(bool facenormalise) { - if (visibleloading) - Game::LoadingScreen(); + Game::LoadingScreen(); static int i; if (type != normaltype && type != decalstype) return; @@ -1358,7 +1354,6 @@ void Model::MakeDecal(int atype, XYZ where, float size, float opacity, float rot Model::~Model() { deallocate(); - textureptr.destroy(); } void Model::deallocate()