diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-11-10 23:55:22 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-11-10 23:55:22 +0000 |
| commit | 8ba546241137c6c1c43751b25e40bbaf610658a1 (patch) | |
| tree | a677c3ad74326acc217842a2d927328597cfe3c8 /code/renderer/tr_image.c | |
| parent | b1613ef65246cc89a1e40e35c6e07080c56ea00b (diff) | |
| download | ioquake3-aero-8ba546241137c6c1c43751b25e40bbaf610658a1.tar.gz ioquake3-aero-8ba546241137c6c1c43751b25e40bbaf610658a1.zip | |
* Fix some new GCC 4.3 warnings
* Fix many many strict aliasing warnings, now that it's re-enabled
git-svn-id: svn://svn.icculus.org/quake3/trunk@1487 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/renderer/tr_image.c')
| -rw-r--r-- | code/renderer/tr_image.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c index 2c3b72f..c86e32a 100644 --- a/code/renderer/tr_image.c +++ b/code/renderer/tr_image.c @@ -1431,7 +1431,11 @@ qhandle_t RE_RegisterSkin( const char *name ) { qhandle_t hSkin; skin_t *skin; skinSurface_t *surf; - char *text, *text_p; + union { + char *c; + void *v; + } text; + char *text_p; char *token; char surfName[MAX_QPATH]; @@ -1480,12 +1484,12 @@ qhandle_t RE_RegisterSkin( const char *name ) { } // load and parse the skin file - ri.FS_ReadFile( name, (void **)&text ); - if ( !text ) { + ri.FS_ReadFile( name, &text.v ); + if ( !text.c ) { return 0; } - text_p = text; + text_p = text.c; while ( text_p && *text_p ) { // get surface name token = CommaParse( &text_p ); @@ -1514,7 +1518,7 @@ qhandle_t RE_RegisterSkin( const char *name ) { skin->numSurfaces++; } - ri.FS_FreeFile( text ); + ri.FS_FreeFile( text.v ); // never let a skin have 0 shaders |