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;
extern bool decals;
extern int loadscreencolor;
-#include "Game.h"
extern Game * pgame;
extern bool visibleloading;
//Functions
}
}
-bool Model::loadnotex(char *filename )
+bool Model::loadnotex(const char *filename )
{
FILE *tfile;
long i;
type=notextype;
color=0;
- tfile=fopen( filename, "rb" );
+ tfile=fopen( ConvertFileName(filename), "rb" );
// read model settings
fseek(tfile, 0, SEEK_SET);
}
-bool Model::load(char *filename,bool texture )
+bool Model::load(const char *filename,bool texture )
{
FILE *tfile;
long i;
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;
numdecals=0;
color=0;
- tfile=fopen( filename, "rb" );
+ tfile=fopen( FixedFN, "rb" );
// read model settings
type = rawtype;
color=0;
- tfile=fopen( filename, "rb" );
+ tfile=fopen( ConvertFileName(filename), "rb" );
// read model settings