patches by jal: fix some warnings, and spawnflags 64 on misc_model to not smooth...

git-svn-id: svn://svn.icculus.org/netradiant/trunk@324 61c419a2-8eb2-4b30-bcec-8cead039b335

diff --git a/libs/mathlib.h b/libs/mathlib.h
index 04fbc0f0d3e688c1e236f3613cb16f757c29d97a..bbf026d452e6c5825b463bcc3ed73b72c1b1d9b2 100644 (file)
--- a/libs/mathlib.h
+++ b/libs/mathlib.h
@@ -273,6 +273,8 @@ void m4x4_transform_normal(const m4x4_t matrix, vec3_t normal);
 void m4x4_transpose(m4x4_t matrix);
 /*! invert an orthogonal 4x3 subset of a 4x4 matrix */
 int m4x4_orthogonal_invert(m4x4_t matrix);
+/*! m4_det */
+float m4_det( m4x4_t mr );
 /*! invert any m4x4 using Kramer's rule.. return 1 if matrix is singular, else return 0 */
 int m4x4_invert(m4x4_t matrix);
 

diff --git a/tools/quake3/q3map2/bspfile_abstract.c b/tools/quake3/q3map2/bspfile_abstract.c
index cf059ca00aedc27c2ec12286528f6105ff6702f0..0e77526fc5d845833be848311f2e38b150602770 100644 (file)
--- a/tools/quake3/q3map2/bspfile_abstract.c
+++ b/tools/quake3/q3map2/bspfile_abstract.c
@@ -331,8 +331,6 @@ int CopyLump( bspHeader_t *header, int lump, void *dest, int size )
 
 int CopyLump_Allocate( bspHeader_t *header, int lump, void **dest, int size, int *allocationVariable )
 {
-       int             length, offset;
-       
        /* get lump length and offset */
        *allocationVariable = header->lumps[ lump ].length / size;
        *dest = realloc(*dest, size * *allocationVariable);

diff --git a/tools/quake3/q3map2/light_ydnar.c b/tools/quake3/q3map2/light_ydnar.c
index 254a8c97bd1c60d596777d8d8870a60f5f3a0962..4b02805986fe1ca18adf74597a732676d2a09c0e 100644 (file)
--- a/tools/quake3/q3map2/light_ydnar.c
+++ b/tools/quake3/q3map2/light_ydnar.c
@@ -1867,8 +1867,6 @@ void IlluminateRawLightmap( int rawLightmapNum )
        float                           tests[ 4 ][ 2 ] = { { 0.0f, 0 }, { 1, 0 }, { 0, 1 }, { 1, 1 } };
        trace_t                         trace;
        float                           stackLightLuxels[ STACK_LL_SIZE ];
-       vec3_t                          flood;
-       float                           *floodlight;
        
        
        /* bail if this number exceeds the number of raw lightmaps */

diff --git a/tools/quake3/q3map2/map.c b/tools/quake3/q3map2/map.c
index 9b7ba71a55c1f33a472b122302f38d6eefb9fc73..1906819adc5f5d98d1d994544b6d056cdd639eb5 100644 (file)
--- a/tools/quake3/q3map2/map.c
+++ b/tools/quake3/q3map2/map.c
@@ -626,7 +626,6 @@ brush_t *FinishBrush( void )
           after the entire entity is parsed, the planenums and texinfos will be adjusted for the origin brush */
        if( buildBrush->compileFlags & C_ORIGIN )
        {
-               char    string[ 32 ];
                vec3_t  origin;
 
                Sys_Printf( "Entity %i, Brush %i: origin brush detected\n", 

diff --git a/tools/quake3/q3map2/model.c b/tools/quake3/q3map2/model.c
index f6553701295f90d72a57667b9efbff6e665a8b84..c4df7ba774eddffc7d4fff4d76b6a8f14043ec34 100644 (file)
--- a/tools/quake3/q3map2/model.c
+++ b/tools/quake3/q3map2/model.c
@@ -268,7 +268,8 @@ void InsertModel( char *name, int frame, m4x4_t transform, remap_t *remap, shade
                        continue;
                
                /* fix the surface's normals */
-               PicoFixSurfaceNormals( surface ); /* why did vortex comment this out? FIXME */
+               if( !(spawnFlags & 64) )
+                       PicoFixSurfaceNormals( surface );
                
                /* allocate a surface (ydnar: gs mods) */
                ds = AllocDrawSurface( SURFACE_TRIANGLES );

diff --git a/tools/quake3/q3map2/prtfile.c b/tools/quake3/q3map2/prtfile.c
index 7108c58973046080aa8a2815e42ebc4638ff1522..2f10c7c0b5b620e279a1370903b8af026198439e 100644 (file)
--- a/tools/quake3/q3map2/prtfile.c
+++ b/tools/quake3/q3map2/prtfile.c
@@ -65,11 +65,9 @@ void WriteFloat (FILE *f, vec_t v)
 
 void CountVisportals_r(node_t *node)
 {
-       int                     i, s;   
+       int                     s;      
        portal_t        *p;
        winding_t       *w;
-       vec3_t          normal;
-       vec_t           dist;
 
        // decision node
        if (node->planenum != PLANENUM_LEAF) {
@@ -170,7 +168,7 @@ void WritePortalFile_r (node_t *node)
 
 void CountSolidFaces_r (node_t *node)
 {
-       int                     i, s;   
+       int                     s;      
        portal_t        *p;
        winding_t       *w;
 
@@ -273,8 +271,9 @@ NumberLeafs_r
 */
 void NumberLeafs_r (node_t *node, int c)
 {
+#if 0
        portal_t        *p;
-
+#endif
        if ( node->planenum != PLANENUM_LEAF ) {
                // decision node
                node->cluster = -99;

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index fe25f5821abf8cb46df8d069ff361295ea79d95a..689fe64297256b64e4c80ff0d1c40647d3ea5a7a 100644 (file)
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -83,7 +83,7 @@ dependencies
 #include "vfs.h"
 #include "png.h"
 #include "md4.h"
-
+#include "radiant_jpeglib.h"
 #include <stdlib.h>