ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-26 03:11:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #394 from jdolan/master

Browse source 
Fix compilation with Clang on OS X, and fix a handful of compiler warnings too.
This commit is contained in:
Timothee "TTimo" Besset 2017-01-01 08:15:04 -06:00 committed by GitHub
commit 4fdf8af8b6
7 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/picomodel/picointernal.c
View file

@ -272,7 +272,7 @@ void _pico_first_token( char *str ) {
return; return;
} }
while (*str && !isspace(*str)) while (*str && !isspace(*str))
*str++; str++;
*str = '\0'; *str = '\0';
} }

2
libs/picomodel/picointernal.h
View file

@ -132,7 +132,7 @@ void _pico_printf( int level, const char *format, ... );
char *_pico_stristr( char *str, const char *substr ); char *_pico_stristr( char *str, const char *substr );
void _pico_unixify( char *path ); void _pico_unixify( char *path );
int _pico_nofname( const char *path, char *dest, int destSize ); int _pico_nofname( const char *path, char *dest, int destSize );
char *_pico_nopath( const char *path ); const char *_pico_nopath( const char *path );
char *_pico_setfext( char *path, const char *ext ); char *_pico_setfext( char *path, const char *ext );
int _pico_getline( char *buf, int bufsize, char *dest, int destsize ); int _pico_getline( char *buf, int bufsize, char *dest, int destsize );
char *_pico_strlwr( char *str ); char *_pico_strlwr( char *str );

4
libs/picomodel/picomodel.vcproj
View file

@ -192,6 +192,10 @@
RelativePath=".\pm_obj.c" RelativePath=".\pm_obj.c"
> >
</File> </File>
<File
RelativePath=".\pm_terrain.c"
>
</File>
<Filter <Filter
Name="lwo" Name="lwo"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

4
libs/picomodel/pm_terrain.c
View file

@ -303,7 +303,7 @@ static int _terrain_canload( PM_PARAMS_CANLOAD ) {
/* keep the friggin compiler happy */ /* keep the friggin compiler happy */
*fileName = *fileName; /**fileName = *fileName*/;
/* create pico parser */ /* create pico parser */
p = _pico_new_parser( (picoByte_t*) buffer, bufSize ); p = _pico_new_parser( (picoByte_t*) buffer, bufSize );
@ -356,7 +356,7 @@ static picoModel_t *_terrain_load( PM_PARAMS_LOAD ) {
/* keep the friggin compiler happy */ /* keep the friggin compiler happy */
*fileName = *fileName; /**fileName = *fileName*/;
/* create pico parser */ /* create pico parser */
p = _pico_new_parser( (picoByte_t*) buffer, bufSize ); p = _pico_new_parser( (picoByte_t*) buffer, bufSize );

14
radiant/brush.cpp
View file

@ -26,7 +26,6 @@
#include "filters.h" #include "filters.h"
extern MainFrame* g_pParentWnd; extern MainFrame* g_pParentWnd;
extern void MemFile_fprintf( MemStream* pMemFile, const char* pText, ... );
// globals // globals
@ -130,7 +129,6 @@ float lightaxis[3] = {0.6f, 0.8f, 1.0f};
improve recognition improve recognition
================ ================
*/ */
extern float ShadeForNormal( vec3_t normal );
float SetShadeForPlane( plane_t *p ){ float SetShadeForPlane( plane_t *p ){
//return ShadeForNormal(p->normal); //return ShadeForNormal(p->normal);
@ -2292,7 +2290,7 @@ face_t *Brush_Ray( vec3_t origin, vec3_t dir, brush_t *b, float *dist, int nFlag
// see Brush_Draw // see Brush_Draw
// do some last minute filtering // do some last minute filtering
if ( firstface && nFlags & SF_CAMERA ) { if ( firstface && ( nFlags & SF_CAMERA ) ) {
if ( g_qeglobals.d_savedinfo.exclude & EXCLUDE_CAULK ) { if ( g_qeglobals.d_savedinfo.exclude & EXCLUDE_CAULK ) {
if ( strstr( firstface->texdef.GetName(), "caulk" ) ) { if ( strstr( firstface->texdef.GetName(), "caulk" ) ) {
*dist = 0; *dist = 0;
@ -3060,7 +3058,7 @@ void Brush_FaceDraw( face_t *face, int nGLState ){
if ( w == NULL ) { if ( w == NULL ) {
return; return;
} }
if ( nGLState & DRAW_GL_LIGHTING && g_PrefsDlg.m_bGLLighting ) { if ( ( nGLState & DRAW_GL_LIGHTING ) && g_PrefsDlg.m_bGLLighting ) {
qglNormal3fv( face->plane.normal ); qglNormal3fv( face->plane.normal );
} }
/* /*
@ -3137,7 +3135,7 @@ void Brush_Draw( brush_t *b ){
if ( bTrans && !( nGLState & DRAW_GL_BLEND ) ) { if ( bTrans && !( nGLState & DRAW_GL_BLEND ) ) {
continue; continue;
} }
if ( !bTrans && nGLState & DRAW_GL_BLEND ) { if ( !bTrans && ( nGLState & DRAW_GL_BLEND ) ) {
continue; continue;
} }
@ -3163,17 +3161,17 @@ void Brush_Draw( brush_t *b ){
} }
} }
if ( nGLState & DRAW_GL_TEXTURE_2D && face->d_texture->name[0] == '(' ) { if ( ( nGLState & DRAW_GL_TEXTURE_2D ) && face->d_texture->name[0] == '(' ) {
prev = NULL; prev = NULL;
qglDisable( GL_TEXTURE_2D ); qglDisable( GL_TEXTURE_2D );
} }
else if ( nGLState & DRAW_GL_TEXTURE_2D && ( nDrawMode == cd_texture || nDrawMode == cd_light ) && face->d_texture != prev ) { else if ( ( nGLState & DRAW_GL_TEXTURE_2D ) && ( nDrawMode == cd_texture || nDrawMode == cd_light ) && face->d_texture != prev ) {
// set the texture for this face // set the texture for this face
prev = face->d_texture; prev = face->d_texture;
qglBindTexture( GL_TEXTURE_2D, face->d_texture->texture_number ); qglBindTexture( GL_TEXTURE_2D, face->d_texture->texture_number );
} }
if ( nGLState & DRAW_GL_LIGHTING && !g_PrefsDlg.m_bGLLighting ) { if ( ( nGLState & DRAW_GL_LIGHTING ) && !g_PrefsDlg.m_bGLLighting ) {
if ( !b->owner->eclass->fixedsize ) { if ( !b->owner->eclass->fixedsize ) {
material[3] = transVal; material[3] = transVal;
} }

6
radiant/texwindow.cpp
View file

@ -780,7 +780,11 @@ void Texture_ShowDirectory(){
g_str_has_suffix( name, "_h" ) || g_str_has_suffix( name, "_h" ) ||
g_str_has_suffix( name, "_local" ) || g_str_has_suffix( name, "_local" ) ||
g_str_has_suffix( name, "_nm" ) || g_str_has_suffix( name, "_nm" ) ||
g_str_has_suffix( name, "_s" )) { g_str_has_suffix( name, "_s" ) ||
g_str_has_suffix( name, "_bump" ) ||
g_str_has_suffix( name, "_gloss" ) ||
g_str_has_suffix( name, "_luma" ) ||
g_str_has_suffix( name, "_norm" ) ) {
continue; continue;
} }

2
tools/quake2/extra/bsp/qbsp3/map.c
View file

@ -22,8 +22,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "qbsp.h" #include "qbsp.h"
extern qboolean onlyents;
int nummapbrushes; int nummapbrushes;
mapbrush_t mapbrushes[MAX_MAP_BRUSHES]; mapbrush_t mapbrushes[MAX_MAP_BRUSHES];