X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.cpp;h=acdc3223465261c58b3288f09516173756d13207;hb=263a338c0c3648cfa2388d4a21584a09294ffd9e;hp=4c4ff7429afa3a3da34684225c29f776e6fa006b;hpb=c44a844d9305c4f1f7dd0479e4a3af3e90b96a1b;p=lugaru.git diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp index 4c4ff74..acdc322 100644 --- a/Source/Terrain.cpp +++ b/Source/Terrain.cpp @@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Objects.h" extern XYZ viewer; extern float viewdistance; -extern float lightambient[3],lightbrightness[3]; extern float fadestart; extern int environment; extern float texscale; @@ -1459,7 +1458,7 @@ void Terrain::DoShadows() if(objects.type[l]!=treetrunktype){ testpoint=terrainpoint; testpoint2=terrainpoint+lightloc*50*(1-shadowed); - if(objects.model[l].LineCheck(&testpoint,&testpoint2,&col,&objects.position[l],&objects.rotation[l])!=-1){ + if(objects.model[l].LineCheck(&testpoint,&testpoint2,&col,&objects.position[l],&objects.yaw[l])!=-1){ shadowed=1-(findDistance(&terrainpoint,&col)/50); } } @@ -1564,12 +1563,12 @@ Terrain::Terrain() } Terrain::~Terrain() { - if(terraintexture)glDeleteTextures( 1, &terraintexture ); - if(shadowtexture) glDeleteTextures( 1, &shadowtexture ); - if(bodyprinttexture) glDeleteTextures( 1, &bodyprinttexture ); - if(footprinttexture) glDeleteTextures( 1, &footprinttexture ); - if(bloodtexture) glDeleteTextures( 1, &bloodtexture ); - if(bloodtexture2) glDeleteTextures( 1, &bloodtexture2 ); - if(breaktexture) glDeleteTextures( 1, &breaktexture ); + glDeleteTextures( 1, &terraintexture ); + glDeleteTextures( 1, &shadowtexture ); + glDeleteTextures( 1, &bodyprinttexture ); + glDeleteTextures( 1, &footprinttexture ); + glDeleteTextures( 1, &bloodtexture ); + glDeleteTextures( 1, &bloodtexture2 ); + glDeleteTextures( 1, &breaktexture ); }