X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.cpp;h=acdc3223465261c58b3288f09516173756d13207;hb=263a338c0c3648cfa2388d4a21584a09294ffd9e;hp=d9c73b056b320ff90bfcc49f8cadd158cbbc74f3;hpb=2f6f7fe7b9562156a966b6cfd62afb2dc69734f7;p=lugaru.git

diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp
index d9c73b0..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;
@@ -38,7 +37,6 @@ extern float blurness;
 extern float targetblurness;
 extern Objects objects;
 extern TGAImageRec texture;
-extern Game * pgame;
 extern bool visibleloading;
 extern bool skyboxtexture;
 extern int tutoriallevel;
@@ -401,7 +399,7 @@ bool Terrain::load(const char *fileName)
 		}
 	}
 	texture.bpp=24;
-	if(visibleloading)pgame->LoadingScreen();
+	if(visibleloading) Game::LoadingScreen();
 
 	texdetail=temptexdetail;
 
@@ -433,7 +431,7 @@ bool Terrain::load(const char *fileName)
 		}
 
 	}
-	if(visibleloading)pgame->LoadingScreen();
+	if(visibleloading) Game::LoadingScreen();
 
 	float slopeness;
 
@@ -442,7 +440,7 @@ bool Terrain::load(const char *fileName)
 			textureness[i][j]=-1;
 		}
 	}
-	if(visibleloading)pgame->LoadingScreen();
+	if(visibleloading) Game::LoadingScreen();
 
 
 	for(i=0;i<size;i++){
@@ -476,7 +474,7 @@ bool Terrain::load(const char *fileName)
 			}
 		}
 	}
-	if(visibleloading)pgame->LoadingScreen();
+	if(visibleloading) Game::LoadingScreen();
 
 	for(i=0;i<size;i++){
 		for(j=0;j<size;j++){
@@ -488,7 +486,7 @@ bool Terrain::load(const char *fileName)
 			}
 		}
 	}
-	if(visibleloading)pgame->LoadingScreen();
+	if(visibleloading) Game::LoadingScreen();
 
 	/*float total;
 	int todivide;
@@ -598,7 +596,7 @@ bool Terrain::load(const char *fileName)
 			}
 		}
 	}
-	if(visibleloading)pgame->LoadingScreen();
+	if(visibleloading) Game::LoadingScreen();
 
 	patch_size=size/subdivision;
 	patch_elements=(patch_size)*(patch_size)*54;
@@ -1460,12 +1458,12 @@ 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);	
 						}
 					}
 				}
-				if(visibleloading)pgame->LoadingScreen();
+				if(visibleloading) Game::LoadingScreen();
 			}
 			brightness=dotproduct(&lightloc,&normals[i][j]);
 			if(shadowed)brightness*=1-shadowed;
@@ -1486,7 +1484,7 @@ void Terrain::DoShadows()
 		}
 	}
 
-	if(visibleloading)pgame->LoadingScreen();
+	if(visibleloading) Game::LoadingScreen();
 
 	//Smooth shadows
 	for(i=0;i<size;i++){
@@ -1565,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 );
 }