X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FModels.cpp;h=f49ddd02e64daf65fe4086a2e7ef06c3196bbc82;hb=cfdbe0ad0521045b27a60dbb1c963ea6dfdcda5a;hp=e51bcfb786c7ce81c2406a1fa2926ae41b6829e1;hpb=0999caf6b9a55c40e2b725b7c2543dfeb2c1623d;p=lugaru.git diff --git a/Source/Models.cpp b/Source/Models.cpp index e51bcfb..f49ddd0 100644 --- a/Source/Models.cpp +++ b/Source/Models.cpp @@ -28,9 +28,7 @@ extern XYZ viewer; extern float fadestart; extern float texdetail; extern bool decals; -extern int loadscreencolor; -extern Game * pgame; extern bool visibleloading; int Model::LineCheck(XYZ *p1,XYZ *p2, XYZ *p, XYZ *move, float *rotate) @@ -481,10 +479,8 @@ bool Model::load(const char *filename,bool texture ) LOG(std::string("Loading model...") + filename); - if(visibleloading){ - loadscreencolor=2; - pgame->LoadingScreen(); - } + if(visibleloading) + Game::LoadingScreen(); int oldvertexNum,oldTriangleNum; oldvertexNum=vertexNum; @@ -846,10 +842,8 @@ void Model::Rotate(float xang,float yang,float zang) void Model::CalculateNormals(bool facenormalise) { - if(visibleloading){ - loadscreencolor=3; - pgame->LoadingScreen(); - } + if(visibleloading) + Game::LoadingScreen(); static int i; if(type!=normaltype&&type!=decalstype)return;