Remove some extra declarations of "channels"

[lugaru.git] / Source / Terrain.cpp

diff --git a/Source/Terrain.cpp b/Source/Terrain.cpp
index 7a78d7b0409d3d39e6d10a6a090d4ac2d37a2335..1683dfc88c0426cd7d2ab8b79bfd903e565a2d0e 100644 (file)
--- a/Source/Terrain.cpp
+++ b/Source/Terrain.cpp
@@ -19,9 +19,9 @@ 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];
@@ -371,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;
@@ -380,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);