X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.cpp;h=41a2181cacefe40556cec8b44fe5ca731f375733;hb=4afbc86d0abd136357e88d8c1fe2360a119289e3;hp=9061f37559694f06f3bcb8ab4f8834f9da0367b7;hpb=a7c9ba64aa7413abb4c566dad8dc796526952d3e;p=lugaru.git diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp index 9061f37..41a2181 100644 --- a/Source/Terrain.cpp +++ b/Source/Terrain.cpp @@ -21,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; @@ -407,7 +409,9 @@ bool Terrain::load(const char *fileName) ImageRec texture; //Load Image - load_image(ConvertFileName(fileName), texture); + if (!load_image(Folders::getResourcePath(fileName).c_str(), texture)) { + return false; + } //Is it valid? if (texture.bpp > 24) { @@ -641,7 +645,7 @@ bool Terrain::load(const char *fileName) patch_elements = (patch_size) * (patch_size) * 54; CalculateNormals(); - return 1; + return true; } void Terrain::CalculateNormals()