X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FModels.cpp;h=e573423ba9eb674cc49b743c26a267cfe217fcd3;hb=440a61a70a5eb14dea5d26aa7cd050e0a3e0e069;hp=e96fe9ff9627d9f82c40d51aa168b4cfad178dff;hpb=43f08119f2408a487dbefcf670bb6c8f47d4c49b;p=lugaru.git

diff --git a/Source/Models.cpp b/Source/Models.cpp
index e96fe9f..e573423 100644
--- a/Source/Models.cpp
+++ b/Source/Models.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 "Models.h"
 //#include "altivec.h"
-#include "Game.h"
 
 extern float multiplier;
 extern float viewdistance;
@@ -10,7 +31,6 @@ extern float texdetail;
 extern bool decals;
 extern int loadscreencolor;
 
-#include "Game.h"
 extern Game * pgame;
 extern bool visibleloading;
 //Functions
@@ -404,7 +424,7 @@ void Model::UpdateVertexArrayNoTexNoNorm(){
 	}
 }
 
-bool Model::loadnotex(char *filename )
+bool Model::loadnotex(const char *filename )
 {
 	FILE			*tfile;
 	long				i;
@@ -416,7 +436,7 @@ bool Model::loadnotex(char *filename )
 	type=notextype;
 	color=0;
 
-	tfile=fopen( filename, "rb" );
+	tfile=fopen( ConvertFileName(filename), "rb" );
 	// read model settings
 
 	fseek(tfile, 0, SEEK_SET);
@@ -479,7 +499,7 @@ bool Model::loadnotex(char *filename )
 }
 
 
-bool Model::load(char *filename,bool texture )
+bool Model::load(const char *filename,bool texture )
 {
 	FILE			*tfile;
 	long				i;
@@ -500,7 +520,7 @@ bool Model::load(char *filename,bool texture )
 	type = normaltype;
 	color=0;
 
-	tfile=fopen( filename, "rb" );
+	tfile=fopen( ConvertFileName(filename), "rb" );
 	// read model settings
 
 
@@ -567,14 +587,17 @@ bool Model::load(char *filename,bool texture )
 	return 1;
 }
 
-bool Model::loaddecal(char *filename,bool texture )
+bool Model::loaddecal(const char *filename,bool texture )
 {
 	FILE			*tfile;
 	long				i,j;
 
 	LOGFUNC;
 
-	LOG(std::string("Loading decal...") + filename);
+	// Changing the filename so that its more os specific
+	char * FixedFN = ConvertFileName(filename);
+
+	LOG(std::string("Loading decal...") + FixedFN);
 
 	int oldvertexNum,oldTriangleNum;
 	oldvertexNum=vertexNum;
@@ -584,7 +607,7 @@ bool Model::loaddecal(char *filename,bool texture )
 	numdecals=0;
 	color=0;
 
-	tfile=fopen( filename, "rb" );
+	tfile=fopen( FixedFN, "rb" );
 	// read model settings
 
 
@@ -691,7 +714,7 @@ bool Model::loadraw(char *filename )
 	type = rawtype;
 	color=0;
 
-	tfile=fopen( filename, "rb" );
+	tfile=fopen( ConvertFileName(filename), "rb" );
 	// read model settings