diff --git a/polymer/eduke32/build/src/polymer.c b/polymer/eduke32/build/src/polymer.c index 3d1c94550..03e53124b 100644 --- a/polymer/eduke32/build/src/polymer.c +++ b/polymer/eduke32/build/src/polymer.c @@ -3832,6 +3832,7 @@ static inline void polymer_scansprites(int16_t sectnum, tspritetype* localtspri // this function's localtsprite is either the tsprite global or // polymer_drawroom's locattsprite, so no aliasing Bmemcpy(&localtsprite[*localspritesortcnt], spr, sizeof(spritetype)); + localtsprite[*localspritesortcnt].extra = 0; localtsprite[(*localspritesortcnt)++].owner = i; } } @@ -4690,16 +4691,10 @@ static void polymer_drawmdsprite(tspritetype *tspr) sk->skinnum == tile2model[Ptile2tile(tspr->picnum,lpal)].skinnum && sk->surfnum == surfi) mdspritematerial.detailscale[0] = mdspritematerial.detailscale[1] = sk->param; - } - if (!(tspr->extra&TSPR_EXTRA_MDHACK)) - { mdspritematerial.specmap = mdloadskin((md2model_t *)m,tile2model[Ptile2tile(tspr->picnum,lpal)].skinnum,SPECULARPAL,surfi); - } - if (!(tspr->extra&TSPR_EXTRA_MDHACK)) - { mdspritematerial.normalmap = mdloadskin((md2model_t *)m,tile2model[Ptile2tile(tspr->picnum,lpal)].skinnum,NORMALPAL,surfi); @@ -4710,10 +4705,7 @@ static void polymer_drawmdsprite(tspritetype *tspr) mdspritematerial.normalbias[0] = sk->specpower; mdspritematerial.normalbias[1] = sk->specfactor; } - } - if (!(tspr->extra&TSPR_EXTRA_MDHACK)) - { mdspritematerial.glowmap = mdloadskin((md2model_t *)m,tile2model[Ptile2tile(tspr->picnum,lpal)].skinnum,GLOWPAL,surfi); } diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c index 828dc7caf..7752d2755 100644 --- a/polymer/eduke32/build/src/polymost.c +++ b/polymer/eduke32/build/src/polymost.c @@ -2524,6 +2524,7 @@ void polymost_editorfunc(void) tsp->shade = 30-shd; tsp->owner = MAXSPRITES-1; tsp->xrepeat = tsp->yrepeat = min(max(1, (int32_t) (dadist*((double)(shd*3)/3200.0))), 255); + tsp->extra = 0; sprite[tsp->owner].xoffset = sprite[tsp->owner].yoffset = 0; tspriteptr[spritesortcnt++] = tsp; }