mirror of
https://github.com/TTimo/GtkRadiant.git
synced 2025-01-10 03:51:18 +00:00
Merge pull request #370 from Pan7/fixwad2
Fix gcc compiler warning for wad
This commit is contained in:
commit
b4f58b6992
2 changed files with 4 additions and 4 deletions
|
@ -52,7 +52,7 @@
|
||||||
#define MDC_DIST_SCALE 0.05f
|
#define MDC_DIST_SCALE 0.05f
|
||||||
|
|
||||||
/* mdc decoding normal table */
|
/* mdc decoding normal table */
|
||||||
double mdcNormals[ 256 ][ 3 ] =
|
const double mdcNormals[ 256 ][ 3 ] =
|
||||||
{
|
{
|
||||||
{ 1.000000, 0.000000, 0.000000 },
|
{ 1.000000, 0.000000, 0.000000 },
|
||||||
{ 0.980785, 0.195090, 0.000000 },
|
{ 0.980785, 0.195090, 0.000000 },
|
||||||
|
|
|
@ -119,9 +119,7 @@ int vfsBuildShortPathName( const char* pPath, char* pBuffer, int nBufferLen ){
|
||||||
strcpy( pBuffer, pPath ); // Use long filename
|
strcpy( pBuffer, pPath ); // Use long filename
|
||||||
}
|
}
|
||||||
return nResult;
|
return nResult;
|
||||||
#endif
|
#elif defined ( __linux__ ) || defined ( __APPLE__ )
|
||||||
|
|
||||||
#if defined ( __linux__ ) || defined ( __APPLE__ )
|
|
||||||
|
|
||||||
// remove /../ from directories
|
// remove /../ from directories
|
||||||
const char *scr = pPath; char *dst = pBuffer;
|
const char *scr = pPath; char *dst = pBuffer;
|
||||||
|
@ -142,6 +140,8 @@ int vfsBuildShortPathName( const char* pPath, char* pBuffer, int nBufferLen ){
|
||||||
*dst = 0;
|
*dst = 0;
|
||||||
|
|
||||||
return strlen( pBuffer );
|
return strlen( pBuffer );
|
||||||
|
#else
|
||||||
|
#error "unsupported platform"
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue