some findClosest* refactoring

[lugaru.git] / Source / Terrain.h

diff --git a/Source/Terrain.h b/Source/Terrain.h
index 71223bda67e0fdc1c472ab1004e7b166f34df57a..051065617675b5e259580423a81c386c4b885cbc 100644 (file)
--- a/Source/Terrain.h
+++ b/Source/Terrain.h
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "TGALoader.h"
 #include "Quaternions.h"
 #include "Quaternions.h"
+#include "Texture.h"
 
 #define max_terrain_size                       256             
 #define curr_terrain_size                      size
@@ -58,13 +59,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 class Terrain{
 public:
-       GLuint bloodtexture;
-       GLuint bloodtexture2;
-       GLuint shadowtexture;
-       GLuint footprinttexture;
-       GLuint bodyprinttexture;
-       GLuint breaktexture;
-       GLuint terraintexture;
+       Texture bloodtexture;
+       Texture bloodtexture2;
+       Texture shadowtexture;
+       Texture footprinttexture;
+       Texture bodyprinttexture;
+       Texture breaktexture;
+       Texture terraintexture;
        short   size;
 
        int patchobjectnum[subdivision][subdivision];
@@ -117,7 +118,7 @@ public:
        void UpdateTransparency(int whichx, int whichy);
        void UpdateTransparencyother(int whichx, int whichy);
        void UpdateTransparencyotherother(int whichx, int whichy);
-       bool load(char *fileName);
+       bool load(const char *fileName);
        void CalculateNormals();
        void drawdecals();
        void draw(int layer);