X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.cpp;h=649d3f390fc1cb2b0ea51a2851d17b5a9942e0b5;hb=0b7253f3d99e4382008aff8b8e221e88ff40d3e9;hp=0ba1ddda95d67b811f6805e553d6076bdea70403;hpb=36cc3af3e5074215817ddee16defde754e2ad67f;p=lugaru.git

diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp
index 0ba1ddd..649d3f3 100644
--- a/Source/Terrain.cpp
+++ b/Source/Terrain.cpp
@@ -1,6 +1,27 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "Game.h"
 #include "Terrain.h"
 #include "Objects.h"
-#include "Game.h"
 extern XYZ viewer;
 extern float viewdistance;
 extern float lightambient[3],lightbrightness[3];
@@ -10,7 +31,7 @@ extern float texscale;
 extern Light light;
 extern float multiplier;
 extern FRUSTUM frustum;
-extern float texdetail,terraindetail;
+extern float texdetail;
 extern int detail;
 extern bool decals;
 extern float blurness;
@@ -350,17 +371,20 @@ void Terrain::UpdateVertexArray(int whichx, int whichy){
 }
 
 
-bool Terrain::load(char *fileName)
+bool Terrain::load(const char *fileName)
 {
 	static long				i,j;
 	static long x,y;
 	static float patch_size;
 
 	float temptexdetail=texdetail;
-	texdetail=terraindetail;
 	//LoadTGA( fileName );
+
+	// Fixing filename so that it works with its own os
+	char * FixedFN = ConvertFileName(fileName);
+
 	unsigned char fileNamep[256];
-	CopyCStringToPascal(fileName,fileNamep);
+	CopyCStringToPascal(FixedFN, fileNamep);
 	//Load Image
 	upload_image( fileNamep ,0); 
 
@@ -404,7 +428,7 @@ bool Terrain::load(char *fileName)
 
 		for(i=0;i<size;i++){
 			for(j=0;j<size;j++){
-				heightmap[size-1-i][j]=(float)((texture.data[(i+(j*size))*texture.bpp/8]))/5/terraindetail;
+				heightmap[size-1-i][j]=(float)((texture.data[(i+(j*size))*texture.bpp/8]))/5;
 			}
 		}
 
@@ -1129,10 +1153,10 @@ void Terrain::AddObject(XYZ where, float radius, int id)
 					points[3].x=(size/subdivision)*i;
 					points[3].z=(size/subdivision)*(j+1);
 					points[3].y=heightmap[(int)points[3].x][(int)points[3].z];
-					points[0]*=scale*terraindetail;
-					points[1]*=scale*terraindetail;
-					points[2]*=scale*terraindetail;
-					points[3]*=scale*terraindetail;
+					points[0]*=scale;
+					points[1]*=scale;
+					points[2]*=scale;
+					points[3]*=scale;
 					if(!done&&where.x+radius>points[0].x&&where.x-radius<points[2].x&&where.z+radius>points[0].z&&where.z-radius<points[2].z){
 						patchobjects[i][j][patchobjectnum[i][j]]=id;
 						patchobjectnum[i][j]++;
@@ -1495,7 +1519,7 @@ Terrain::Terrain()
 	memset(patchobjectnum, 0, sizeof(patchobjectnum));
 	memset(patchobjects, 0, sizeof(patchobjects));
 
-	scale = 0;
+	scale = 1.0f;
 	type = 0;
 	memset(heightmap, 0, sizeof(heightmap));
 	memset(normals, 0, sizeof(normals));
@@ -1530,12 +1554,12 @@ Terrain::Terrain()
 }
 Terrain::~Terrain()
 {
-	if(terraintexture)glDeleteTextures( 1, (const unsigned long *)&terraintexture );
-	if(shadowtexture) glDeleteTextures( 1, (const unsigned long *)&shadowtexture );
-	if(bodyprinttexture) glDeleteTextures( 1, (const unsigned long *)&bodyprinttexture );
-	if(footprinttexture) glDeleteTextures( 1, (const unsigned long *)&footprinttexture );
-	if(bloodtexture) glDeleteTextures( 1, (const unsigned long *)&bloodtexture );
-	if(bloodtexture2) glDeleteTextures( 1, (const unsigned long *)&bloodtexture2 );
-	if(breaktexture) glDeleteTextures( 1, (const unsigned long *)&breaktexture );
+	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 );
 }