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

diff --git a/Source/Models.cpp b/Source/Models.cpp
index b006c6d..5339b9b 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
@@ -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);
@@ -595,7 +594,10 @@ bool Model::loaddecal(char *filename,bool texture )
 
 	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