X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=libs%2Fpicomodel%2Fpm_mdc.c;h=816adebb6ff1c0d35ae4c9ee5f600d6302b06156;hb=HEAD;hp=235dcecf9467c0ca90d1508e0fef403e1adf285e;hpb=a8f1237884e3741541e891724fbae07f8ff7d3b8;p=xonotic%2Fnetradiant.git diff --git a/libs/picomodel/pm_mdc.c b/libs/picomodel/pm_mdc.c index 235dcecf..816adebb 100644 --- a/libs/picomodel/pm_mdc.c +++ b/libs/picomodel/pm_mdc.c @@ -45,7 +45,7 @@ const float MDC_MAX_OFS = 127.0f; const float MDC_DIST_SCALE = 0.05f; /* mdc decoding normal table */ -double mdcNormals[ 256 ][ 3 ] = +const double mdcNormals[ 256 ][ 3 ] = { { 1.000000, 0.000000, 0.000000 }, { 0.980785, 0.195090, 0.000000 }, @@ -460,7 +460,6 @@ static picoModel_t *_mdc_load( PM_PARAMS_LOAD ){ picoShader_t *picoShader; picoVec3_t xyz, normal; picoVec2_t st; - picoColor_t color; /* ------------------------------------------------- @@ -641,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 ); @@ -667,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 ) { @@ -711,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 */