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

diff --git a/Source/Models.cpp b/Source/Models.cpp
index b006c6d..e573423 100644
--- a/Source/Models.cpp
+++ b/Source/Models.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 "Models.h"
 //#include "altivec.h"
-#include "Game.h"
 
 extern float multiplier;
 extern float viewdistance;
@@ -31,7 +31,6 @@ extern float texdetail;
 extern bool decals;
 extern int loadscreencolor;
 
-#include "Game.h"
 extern Game * pgame;
 extern bool visibleloading;
 //Functions
@@ -425,7 +424,7 @@ void Model::UpdateVertexArrayNoTexNoNorm(){
 	}
 }
 
-bool Model::loadnotex(char *filename )
+bool Model::loadnotex(const char *filename )
 {
 	FILE			*tfile;
 	long				i;
@@ -437,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);
@@ -500,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;
@@ -588,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;
@@ -605,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
 
 
@@ -712,7 +714,7 @@ bool Model::loadraw(char *filename )
 	type = rawtype;
 	color=0;
 
-	tfile=fopen( filename, "rb" );
+	tfile=fopen( ConvertFileName(filename), "rb" );
 	// read model settings