X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FModels.cpp;h=e573423ba9eb674cc49b743c26a267cfe217fcd3;hb=decb00e82a2e65e25dbcdd8f16fff5a6a07d31d6;hp=1eae46867c265e011890d9eef60c136ce571f0fc;hpb=d435148bf0fd538f3b69a8232253618e10249ffa;p=lugaru.git

diff --git a/Source/Models.cpp b/Source/Models.cpp
index 1eae468..e573423 100644
--- a/Source/Models.cpp
+++ b/Source/Models.cpp
@@ -424,7 +424,7 @@ void Model::UpdateVertexArrayNoTexNoNorm(){
 	}
 }
 
-bool Model::loadnotex(char *filename )
+bool Model::loadnotex(const char *filename )
 {
 	FILE			*tfile;
 	long				i;
@@ -436,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);
@@ -499,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;
@@ -587,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;
@@ -604,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
 
 
@@ -711,7 +714,7 @@ bool Model::loadraw(char *filename )
 	type = rawtype;
 	color=0;
 
-	tfile=fopen( filename, "rb" );
+	tfile=fopen( ConvertFileName(filename), "rb" );
 	// read model settings