X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.cpp;h=41a2181cacefe40556cec8b44fe5ca731f375733;hb=8a6a4b71914b97fb154abdceef4db768633e71df;hp=b0aff61581df56406c7c174de27d4fa09bf620cb;hpb=2a9d19feea3589e45e3f6aa4e7b6052732b35f3f;p=lugaru.git
diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp
index b0aff61..41a2181 100644
--- a/Source/Terrain.cpp
+++ b/Source/Terrain.cpp
@@ -1,5 +1,6 @@
/*
Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
@@ -20,6 +21,8 @@ along with Lugaru. If not, see .
#include "Game.h"
#include "Terrain.h"
#include "Objects.h"
+#include "Utils/Folders.h"
+
extern XYZ viewer;
extern float viewdistance;
extern float fadestart;
@@ -34,7 +37,6 @@ extern bool decals;
extern float blurness;
extern float targetblurness;
extern Objects objects;
-extern TGAImageRec texture;
extern bool visibleloading;
extern bool skyboxtexture;
extern int tutoriallevel;
@@ -197,7 +199,6 @@ void Terrain::UpdateTransparency(int whichx, int whichy)
void Terrain::UpdateTransparencyother(int whichx, int whichy)
{
- static XYZ vertex;
static int i, j, a, b, c, d, patch_size, stepsize;
patch_size = size / subdivision;
@@ -404,15 +405,13 @@ bool Terrain::load(const char *fileName)
static float patch_size;
float temptexdetail = texdetail;
- //LoadTGA( fileName );
- // Fixing filename so that it works with its own os
- char * FixedFN = ConvertFileName(fileName);
+ ImageRec texture;
- unsigned char fileNamep[256];
- CopyCStringToPascal(FixedFN, fileNamep);
//Load Image
- upload_image( fileNamep , 0);
+ if (!load_image(Folders::getResourcePath(fileName).c_str(), texture)) {
+ return false;
+ }
//Is it valid?
if (texture.bpp > 24) {
@@ -516,28 +515,6 @@ bool Terrain::load(const char *fileName)
if (visibleloading)
Game::LoadingScreen();
- /*float total;
- int todivide;
- //Smooth opacityother
- for(i=0;i0&&patchy[1]>0)
- if(patchx[2]0&&patchy[2]>0)
- if(patchx[3]0&&patchy[3]>0)
- if(patchx[0]0&&patchy[0]>0){
- */
if ((patchx[0] != patchx[1] || patchy[0] != patchy[1]) && (patchx[0] != patchx[2] || patchy[0] != patchy[2]) && (patchx[0] != patchx[3] || patchy[0] != patchy[3])) {
MakeDecalLock(type, where, patchx[0], patchy[0], size, opacity, rotation);
}