X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.cpp;h=b3ea6a02e5c4384b46e87013a15769b2bc852776;hb=df1b94eadd015b59bcc2d6651e4a84f6e882ef28;hp=0ba1ddda95d67b811f6805e553d6076bdea70403;hpb=36cc3af3e5074215817ddee16defde754e2ad67f;p=lugaru.git diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp index 0ba1ddd..b3ea6a0 100644 --- a/Source/Terrain.cpp +++ b/Source/Terrain.cpp @@ -1495,7 +1495,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,12 +1530,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 ); }