fix SW since Spike broke it
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2036 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
d0661cdc47
commit
8b960915b5
3 changed files with 9 additions and 9 deletions
|
@ -1070,18 +1070,18 @@ void D_DrawSprite (void)
|
|||
D_SpriteDrawSpans16 (sprite_spans);
|
||||
else //1
|
||||
{
|
||||
if (currententity->alpha > TRANS_LOWER_CAP)
|
||||
if (currententity->shaderRGBAf[3] > TRANS_LOWER_CAP)
|
||||
{
|
||||
if (currententity->flags & Q2RF_ADDATIVE)
|
||||
{
|
||||
D_SetTransLevel(currententity->alpha, BM_ADD);
|
||||
D_SetTransLevel(currententity->shaderRGBAf[3], BM_ADD);
|
||||
D_SpriteDrawSpansAdditive (sprite_spans);
|
||||
}
|
||||
else if (currententity->alpha > TRANS_UPPER_CAP)
|
||||
else if (currententity->shaderRGBAf[3] > TRANS_UPPER_CAP)
|
||||
D_SpriteDrawSpans (sprite_spans);
|
||||
else
|
||||
{
|
||||
D_SetTransLevel(currententity->alpha, BM_BLEND);
|
||||
D_SetTransLevel(currententity->shaderRGBAf[3], BM_BLEND);
|
||||
D_SpriteDrawSpansTrans (sprite_spans);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -878,22 +878,22 @@ void R_AliasDrawModel (alight_t *plighting)
|
|||
|
||||
if (r_pixbytes == 1)
|
||||
{
|
||||
if (currententity->alpha < TRANS_LOWER_CAP)
|
||||
if (currententity->shaderRGBAf[3] < TRANS_LOWER_CAP)
|
||||
return;
|
||||
|
||||
if (currententity->alpha > TRANS_UPPER_CAP)
|
||||
if (currententity->shaderRGBAf[3] > TRANS_UPPER_CAP)
|
||||
{
|
||||
transbackfac = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
D_SetTransLevel(currententity->alpha, BM_BLEND);
|
||||
D_SetTransLevel(currententity->shaderRGBAf[3], BM_BLEND);
|
||||
transbackfac = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
transfactor = currententity->alpha*255;
|
||||
transfactor = currententity->shaderRGBAf[3]*255;
|
||||
transbackfac = 255 - transfactor;
|
||||
}
|
||||
|
||||
|
|
|
@ -3066,7 +3066,7 @@ void SWMod_LoadAlias3Model (model_t *mod, void *buffer)
|
|||
#endif
|
||||
#ifdef AVAIL_PNGLIB
|
||||
if (!texture)
|
||||
texture = ReadPNGFile(buffer, com_filesize, &width, &height);
|
||||
texture = ReadPNGFile(buffer, com_filesize, &width, &height, pinskin->name);
|
||||
#endif
|
||||
if (!texture)
|
||||
texture = ReadPCXFile(buffer, com_filesize, &width, &height);
|
||||
|
|
Loading…
Reference in a new issue