X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FTerrain.cpp;h=1683dfc88c0426cd7d2ab8b79bfd903e565a2d0e;hb=95f9e53a3672d79b13521d18d744a0c872fdeb6e;hp=b3ea6a02e5c4384b46e87013a15769b2bc852776;hpb=df1b94eadd015b59bcc2d6651e4a84f6e882ef28;p=lugaru.git diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp index b3ea6a0..1683dfc 100644 --- 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]; @@ -350,7 +371,7 @@ void Terrain::UpdateVertexArray(int whichx, int whichy){ } -bool Terrain::load(char *fileName) +bool Terrain::load(const char *fileName) { static long i,j; static long x,y; @@ -359,8 +380,12 @@ bool Terrain::load(char *fileName) float temptexdetail=texdetail; texdetail=terraindetail; //LoadTGA( fileName ); + + // Fixing filename so that it works with its own os + char * FixedFN = ConvertFileName(fileName); + unsigned char fileNamep[256]; - CopyCStringToPascal(fileName,fileNamep); + CopyCStringToPascal(FixedFN, fileNamep); //Load Image upload_image( fileNamep ,0);