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

diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp
index 7a78d7b..649d3f3 100644
--- a/Source/Terrain.cpp
+++ b/Source/Terrain.cpp
@@ -19,9 +19,9 @@ 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];
@@ -31,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;
@@ -371,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); 
 
@@ -425,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;
 			}
 		}
 
@@ -1150,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]++;