Merge commit 'c5a6237a2b002c9811719172931b0c9cc5a725f4' into master-merge

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

diff --git a/libs/picomodel/pm_mdc.c b/libs/picomodel/pm_mdc.c
index 7e898ff1e3887f2c6d980831959c1d3c313268e1..ec40d5a9c842ae2fccb766505bf3dd52cee4d3ab 100644 (file)
--- a/libs/picomodel/pm_mdc.c
+++ b/libs/picomodel/pm_mdc.c
@@ -32,24 +32,17 @@
 
    ----------------------------------------------------------------------------- */
 
-
-
-/* marker */
-#define PM_MDC_C
-
-
-
 /* dependencies */
 #include "picointernal.h"
 
 /* mdc model format */
-#define MDC_MAGIC           "IDPC"
-#define MDC_VERSION         2
+const char *MDC_MAGIC = "IDPC";
+const int MDC_VERSION = 2;
 
 /* mdc vertex scale */
-#define MDC_SCALE           ( 1.0f / 64.0f )
-#define MDC_MAX_OFS         127.0f
-#define MDC_DIST_SCALE      0.05f
+const float MDC_SCALE           = ( 1.0f / 64.0f );
+const float MDC_MAX_OFS         = 127.0f;
+const float MDC_DIST_SCALE      = 0.05f;
 
 /* mdc decoding normal table */
 double mdcNormals[ 256 ][ 3 ] =
@@ -467,7 +460,6 @@ static picoModel_t *_mdc_load( PM_PARAMS_LOAD ){
        picoShader_t        *picoShader;
        picoVec3_t xyz, normal;
        picoVec2_t st;
-       picoColor_t color;
 
 
        /* -------------------------------------------------
@@ -648,7 +640,7 @@ static picoModel_t *_mdc_load( PM_PARAMS_LOAD ){
 
                /* detox and set shader name */
                shader = (mdcShader_t*) ( (picoByte_t*) surface + surface->ofsShaders );
-               _pico_setfext( shader->name, "" );
+               _pico_setfext( shader->name, NULL );
                _pico_unixify( shader->name );
                PicoSetShaderName( picoShader, shader->name );
 
@@ -674,7 +666,6 @@ static picoModel_t *_mdc_load( PM_PARAMS_LOAD ){
                                vertexComp = (mdcXyzCompressed_t *) ( (picoByte_t *) surface + surface->ofsXyzCompressed ) + ( *mdcCompVert * surface->numVerts );
                        }
                }
-               _pico_set_color( color, 255, 255, 255, 255 );
 
                for ( j = 0; j < surface->numVerts; j++, texCoord++, mdcShort += 4 )
                {
@@ -718,7 +709,7 @@ static picoModel_t *_mdc_load( PM_PARAMS_LOAD ){
                        PicoSetSurfaceST( picoSurface, 0, j, st );
 
                        /* set color */
-                       PicoSetSurfaceColor( picoSurface, 0, j, color );
+                       PicoSetSurfaceColor( picoSurface, 0, j, picoColor_white );
                }
 
                /* get next surface */