gcc: appease the hardening warnings

[xonotic/netradiant.git] / libs / picomodel / picomodel.c

diff --git a/libs/picomodel/picomodel.c b/libs/picomodel/picomodel.c
index 4526745c290b6a0d83acaeb8885b82599d988f83..8a3980cb37c1988790b3bf1f725a20b8b2ee6439 100644 (file)
--- a/libs/picomodel/picomodel.c
+++ b/libs/picomodel/picomodel.c
@@ -32,13 +32,6 @@
 
    ----------------------------------------------------------------------------- */
 
-
-
-/* marker */
-#define PICOMODEL_C
-
-
-
 /* dependencies */
 #include "picointernal.h"
 
@@ -1426,7 +1419,7 @@ int PicoGetSurfaceSpecial( picoSurface_t *surface, int num ){
 
 /* hashtable code for faster vertex lookups */
 //#define HASHTABLE_SIZE 32768 // 2048                 /* power of 2, use & */
-#define HASHTABLE_SIZE 7919 // 32749 // 2039    /* prime, use % */
+const int HASHTABLE_SIZE = 7919; // 32749 // 2039    /* prime, use % */
 
 int PicoGetHashTableSize( void ){
        return HASHTABLE_SIZE;
@@ -2180,7 +2173,6 @@ int PicoRemapModel( picoModel_t *model, char *remapFile ){
                                }
                                /* remap shader's ambient color */
                                else if ( !_pico_stricmp( p->token,"ambient" ) ) {
-                                       picoColor_t color;
                                        picoVec3_t v;
 
                                        /* get vector from parser */
@@ -2189,16 +2181,13 @@ int PicoRemapModel( picoModel_t *model, char *remapFile ){
                                        }
 
                                        /* store as color */
-                                       color[ 0 ] = (picoByte_t)v[ 0 ];
-                                       color[ 1 ] = (picoByte_t)v[ 1 ];
-                                       color[ 2 ] = (picoByte_t)v[ 2 ];
+                                       picoColor_t color = {(picoByte_t) v[0], (picoByte_t) v[1], (picoByte_t) v[2]};
 
                                        /* set new ambient color */
                                        PicoSetShaderAmbientColor( shader,color );
                                }
                                /* remap shader's diffuse color */
                                else if ( !_pico_stricmp( p->token,"diffuse" ) ) {
-                                       picoColor_t color;
                                        picoVec3_t v;
 
                                        /* get vector from parser */
@@ -2207,16 +2196,13 @@ int PicoRemapModel( picoModel_t *model, char *remapFile ){
                                        }
 
                                        /* store as color */
-                                       color[ 0 ] = (picoByte_t)v[ 0 ];
-                                       color[ 1 ] = (picoByte_t)v[ 1 ];
-                                       color[ 2 ] = (picoByte_t)v[ 2 ];
+                                       picoColor_t color = {(picoByte_t) v[0], (picoByte_t) v[1], (picoByte_t) v[2]};
 
                                        /* set new ambient color */
                                        PicoSetShaderDiffuseColor( shader,color );
                                }
                                /* remap shader's specular color */
                                else if ( !_pico_stricmp( p->token,"specular" ) ) {
-                                       picoColor_t color;
                                        picoVec3_t v;
 
                                        /* get vector from parser */
@@ -2225,9 +2211,7 @@ int PicoRemapModel( picoModel_t *model, char *remapFile ){
                                        }
 
                                        /* store as color */
-                                       color[ 0 ] = (picoByte_t)v[ 0 ];
-                                       color[ 1 ] = (picoByte_t)v[ 1 ];
-                                       color[ 2 ] = (picoByte_t)v[ 2 ];
+                                       picoColor_t color = {(picoByte_t) v[0], (picoByte_t) v[1], (picoByte_t) v[2]};
 
                                        /* set new ambient color */
                                        PicoSetShaderSpecularColor( shader,color );