Stopped using Account pointers, and removed general difficulty setting (difficulty...

[lugaru.git] / Source / Terrain.h

diff --git a/Source/Terrain.h b/Source/Terrain.h
index bc57ca061e52fbde0a4b4aa82e355f1dd7ef2067..c375687f4aa4f52ece092a7e85fcec5c10905d84 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 #include "gamegl.h"
 #include "Frustum.h"
 #include "Lights.h"
-#include "TGALoader.h"
+#include "ImageIO.h"
 #include "Quaternions.h"
 #include "Quaternions.h"
 #include "Texture.h"
@@ -109,7 +110,6 @@ public:
     void MakeDecalLock(int type, XYZ where, int whichx, int whichy, float size, float opacity, float rotation);
     int lineTerrain(XYZ p1, XYZ p2, XYZ *p);
     float getHeight(float pointx, float pointz);
-    float getHeightExtrude(float pointx, float pointz, float point2x, float point2z);
     float getOpacity(float pointx, float pointz);
     XYZ getLighting(float pointx, float pointz);
     XYZ getNormal(float pointx, float pointz);
@@ -117,14 +117,13 @@ 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);
     void drawpatch(int whichx, int whichy, float opacity);
     void drawpatchother(int whichx, int whichy, float opacity);
     void drawpatchotherother(int whichx, int whichy, float opacity);
-    void DoLighting();
     void DoShadows();
 
     Terrain();