X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.h;h=c375687f4aa4f52ece092a7e85fcec5c10905d84;hb=9bd0be2befdf81aa4b5d377eaf29656935044faf;hp=9f919b485734d61456e227140b71c4c5dc3aae16;hpb=2a9d19feea3589e45e3f6aa4e7b6052732b35f3f;p=lugaru.git diff --git a/Source/Terrain.h b/Source/Terrain.h index 9f919b4..c375687 100644 --- a/Source/Terrain.h +++ b/Source/Terrain.h @@ -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. @@ -23,7 +24,7 @@ along with Lugaru. If not, see . #include "gamegl.h" #include "Frustum.h" #include "Lights.h" -#include "TGALoader.h" +#include "ImageIO.h" #include "Quaternions.h" #include "Quaternions.h" #include "Texture.h" @@ -116,7 +117,7 @@ public: void UpdateTransparency(int whichx, int whichy); void UpdateTransparencyother(int whichx, int whichy); void UpdateTransparencyotherother(int whichx, int whichy); - bool load(const char *fileName); + bool load(const std::string& fileName); void CalculateNormals(); void drawdecals(); void draw(int layer);