X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FModels.cpp;h=bdc44dcdd2182a76278f95c4641a85ab1006d890;hb=263a338c0c3648cfa2388d4a21584a09294ffd9e;hp=4db0b741709a39ae0317390f4dd7d750d1fd3390;hpb=bbf8873b80baf3cb468ac12b3f62b0938320fef1;p=lugaru.git diff --git a/Source/Models.cpp b/Source/Models.cpp index 4db0b74..bdc44dc 100644 --- a/Source/Models.cpp +++ b/Source/Models.cpp @@ -29,7 +29,6 @@ extern float fadestart; extern float texdetail; extern bool decals; -extern Game * pgame; extern bool visibleloading; int Model::LineCheck(XYZ *p1,XYZ *p2, XYZ *p, XYZ *move, float *rotate) @@ -481,7 +480,7 @@ bool Model::load(const char *filename,bool texture ) LOG(std::string("Loading model...") + filename); if(visibleloading) - pgame->LoadingScreen(); + Game::LoadingScreen(); int oldvertexNum,oldTriangleNum; oldvertexNum=vertexNum; @@ -844,7 +843,7 @@ void Model::Rotate(float xang,float yang,float zang) void Model::CalculateNormals(bool facenormalise) { if(visibleloading) - pgame->LoadingScreen(); + Game::LoadingScreen(); static int i; if(type!=normaltype&&type!=decalstype)return; @@ -1387,7 +1386,7 @@ Model::~Model() { deallocate(); - if(textureptr) glDeleteTextures( 1, &textureptr ); + glDeleteTextures( 1, &textureptr ); } void Model::deallocate()