X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.h;h=051065617675b5e259580423a81c386c4b885cbc;hb=4e3b68a29afbbd5d0b02dc29810cc89dd2b0d092;hp=507ff640701bd0a4ca598ebbdc4242d27383df88;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git

diff --git a/Source/Terrain.h b/Source/Terrain.h
index 507ff64..0510656 100644
--- a/Source/Terrain.h
+++ b/Source/Terrain.h
@@ -1,12 +1,34 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #ifndef _TERRAIN_H_
 #define _TERRAIN_H_
 
-#include "gl.h"
+#include "gamegl.h"
 #include "Frustum.h"
 #include "Lights.h"
 #include "TGALoader.h"
 #include "Quaternions.h"
 #include "Quaternions.h"
+#include "Texture.h"
 
 #define max_terrain_size			256		
 #define curr_terrain_size			size
@@ -37,13 +59,13 @@
 
 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];
@@ -96,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);
@@ -110,4 +132,4 @@ public:
 	~Terrain();
 };
 
-#endif
\ No newline at end of file
+#endif