X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.cpp;h=7a78d7b0409d3d39e6d10a6a090d4ac2d37a2335;hb=9a5f2758e538d9216d255b4797f042a1b6874272;hp=4ed120babd59b86974522cc16044da47d3304f0d;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git

diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp
index 4ed120b..7a78d7b 100644
--- a/Source/Terrain.cpp
+++ b/Source/Terrain.cpp
@@ -1,3 +1,24 @@
+/*
+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.
+*/
+
 #include "Terrain.h"
 #include "Objects.h"
 #include "Game.h"
@@ -1495,7 +1516,7 @@ Terrain::Terrain()
 	memset(patchobjectnum, 0, sizeof(patchobjectnum));
 	memset(patchobjects, 0, sizeof(patchobjects));
 
-	scale = 0;
+	scale = 1.0f;
 	type = 0;
 	memset(heightmap, 0, sizeof(heightmap));
 	memset(normals, 0, sizeof(normals));
@@ -1530,11 +1551,12 @@ Terrain::Terrain()
 }
 Terrain::~Terrain()
 {
-	if(terraintexture)glDeleteTextures( 1, (const unsigned long *)&terraintexture );
-	if(shadowtexture) glDeleteTextures( 1, (const unsigned long *)&shadowtexture );
-	if(bodyprinttexture) glDeleteTextures( 1, (const unsigned long *)&bodyprinttexture );
-	if(footprinttexture) glDeleteTextures( 1, (const unsigned long *)&footprinttexture );
-	if(bloodtexture) glDeleteTextures( 1, (const unsigned long *)&bloodtexture );
-	if(bloodtexture2) glDeleteTextures( 1, (const unsigned long *)&bloodtexture2 );
-	if(breaktexture) glDeleteTextures( 1, (const unsigned long *)&breaktexture );
+	if(terraintexture)glDeleteTextures( 1, &terraintexture );
+	if(shadowtexture) glDeleteTextures( 1, &shadowtexture );
+	if(bodyprinttexture) glDeleteTextures( 1, &bodyprinttexture );
+	if(footprinttexture) glDeleteTextures( 1, &footprinttexture );
+	if(bloodtexture) glDeleteTextures( 1, &bloodtexture );
+	if(bloodtexture2) glDeleteTextures( 1, &bloodtexture2 );
+	if(breaktexture) glDeleteTextures( 1, &breaktexture );
 }
+