lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix erroneous merge conflict resolution.

This commit is contained in:
Nev3r 2020-07-06 11:54:55 +02:00
parent fd5b05cafc
commit 42d92eab2c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hardware/hw_main.c
View File

@ -770,16 +770,16 @@ FBITFIELD HWR_TranstableToAlpha(INT32 transtablenum, FSurfaceInfo *pSurf)
{
switch (transtablenum)
{
case 0 : pSurf->FlatColor.s.alpha = 0x00;return PF_Masked;
case tr_trans10 : pSurf->FlatColor.s.alpha = 0xe6;return PF_Translucent;
case tr_trans20 : pSurf->FlatColor.s.alpha = 0xcc;return PF_Translucent;
case tr_trans30 : pSurf->FlatColor.s.alpha = 0xb3;return PF_Translucent;
case tr_trans40 : pSurf->FlatColor.s.alpha = 0x99;return PF_Translucent;
case tr_trans50 : pSurf->FlatColor.s.alpha = 0x80;return PF_Translucent;
case tr_trans60 : pSurf->FlatColor.s.alpha = 0x66;return PF_Translucent;
case tr_trans70 : pSurf->FlatColor.s.alpha = 0x4c;return PF_Translucent;
case tr_trans80 : pSurf->FlatColor.s.alpha = 0x33;return PF_Translucent;
case tr_trans90 : pSurf->FlatColor.s.alpha = 0x19;return PF_Translucent;
case 0 : pSurf->PolyColor.s.alpha = 0x00;return PF_Masked;
case tr_trans10 : pSurf->PolyColor.s.alpha = 0xe6;return PF_Translucent;
case tr_trans20 : pSurf->PolyColor.s.alpha = 0xcc;return PF_Translucent;
case tr_trans30 : pSurf->PolyColor.s.alpha = 0xb3;return PF_Translucent;
case tr_trans40 : pSurf->PolyColor.s.alpha = 0x99;return PF_Translucent;
case tr_trans50 : pSurf->PolyColor.s.alpha = 0x80;return PF_Translucent;
case tr_trans60 : pSurf->PolyColor.s.alpha = 0x66;return PF_Translucent;
case tr_trans70 : pSurf->PolyColor.s.alpha = 0x4c;return PF_Translucent;
case tr_trans80 : pSurf->PolyColor.s.alpha = 0x33;return PF_Translucent;
case tr_trans90 : pSurf->PolyColor.s.alpha = 0x19;return PF_Translucent;
}
return PF_Translucent;
}