+/*
+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;
extern bool decals;
extern int loadscreencolor;
-#include "Game.h"
extern Game * pgame;
extern bool visibleloading;
//Functions
type=notextype;
color=0;
- tfile=fopen( filename, "rb" );
+ tfile=fopen( ConvertFileName(filename), "rb" );
// read model settings
fseek(tfile, 0, SEEK_SET);
type = normaltype;
color=0;
- tfile=fopen( filename, "rb" );
+ tfile=fopen( ConvertFileName(filename), "rb" );
// read model settings
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
if(color)glInterleavedArrays( GL_T2F_C3F_V3F,8*sizeof(GLfloat),&vArray[0]);
glBindTexture(GL_TEXTURE_2D,(unsigned long)textureptr);
-#ifndef WIN32
+#if PLATFORM_MACOSX
glLockArraysEXT( 0, TriangleNum*3);
#endif
glDrawArrays(GL_TRIANGLES, 0, TriangleNum*3);
-#ifndef WIN32
+#if PLATFORM_MACOSX
glUnlockArraysEXT();
#endif