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

Little adjustments

Browse source 
* Swap MF_NOCLIMB and MF_EFFECT1
* Implement if Front Y Offset < 1 (== 0), then set alpha immediately
This commit is contained in:
mazmazz 2018-04-06 22:34:45 -04:00
parent 8d3c9d91f1
commit 73e4cab1e4
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_spec.c
View file

@ -3105,8 +3105,8 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
P_AddMasterFader(sides[line->sidenum[0]].textureoffset>>FRACBITS, P_AddMasterFader(sides[line->sidenum[0]].textureoffset>>FRACBITS,
sides[line->sidenum[0]].rowoffset>>FRACBITS, sides[line->sidenum[0]].rowoffset>>FRACBITS,
(line->flags & ML_BLOCKMONSTERS), // handle FF_EXISTS (line->flags & ML_BLOCKMONSTERS), // handle FF_EXISTS
(line->flags & ML_NOCLIMB), // handle FF_SOLID (line->flags & ML_EFFECT1), // handle FF_SOLID
!(line->flags & ML_EFFECT1), // do not handle FF_TRANSLUCENT !(line->flags & ML_NOCLIMB), // do not handle FF_TRANSLUCENT
(INT32)(sectors[s].lines[j]-lines)); (INT32)(sectors[s].lines[j]-lines));
break; break;
} }
@ -7130,7 +7130,7 @@ static void P_AddMasterFader(INT32 destvalue, INT32 speed, BOOL handleexist, BOO
d->thinker.function.acp1 = (actionf_p1)T_Fade; d->thinker.function.acp1 = (actionf_p1)T_Fade;
d->affectee = line; d->affectee = line;
d->destvalue = max(1, min(256, destvalue)); // ffloor->alpha is 1-256 d->destvalue = max(1, min(256, destvalue)); // ffloor->alpha is 1-256
d->speed = max(1, speed); // minimum speed 1/tic d->speed = speed; // minimum speed 1/tic // if speed < 1, alpha is set immediately in thinker
// combine the flags-to-handle, this is more convenient than separate BOOLS // combine the flags-to-handle, this is more convenient than separate BOOLS
d->handleflags = 0; d->handleflags = 0;
@ -7172,7 +7172,7 @@ void T_Fade(fade_t *d)
if (rover->alpha > d->destvalue) if (rover->alpha > d->destvalue)
{ {
// finish fading out // finish fading out
if (rover->alpha - d->speed <= d->destvalue + d->speed) if (d->speed < 1 || rover->alpha - d->speed <= d->destvalue + d->speed)
{ {
if (rover->alpha != d->destvalue) if (rover->alpha != d->destvalue)
{ {
@ -7240,7 +7240,7 @@ void T_Fade(fade_t *d)
else // fade in else // fade in
{ {
// finish fading in // finish fading in
if (rover->alpha + d->speed >= d->destvalue - d->speed) if (d->speed < 1 || rover->alpha + d->speed >= d->destvalue - d->speed)
{ {
if (rover->alpha != d->destvalue) if (rover->alpha != d->destvalue)
{ {