Switching to default branch and closing cmake branch; Merged with Icculus's repository

[lugaru.git] / Source / Terrain.cpp

diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp
index a102e523f4c86cfaa235e873dff77e2ad26e521d..e56f681f8190c9359c5741941855fd4ab1777ebb 100644 (file)
--- a/Source/Terrain.cpp
+++ b/Source/Terrain.cpp
@@ -1,6 +1,27 @@
+/*
+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 "Game.h"
 #include "Terrain.h"
 #include "Objects.h"
-#include "Game.h"
 extern XYZ viewer;
 extern float viewdistance;
 extern float lightambient[3],lightbrightness[3];
@@ -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));