Balloon error fix, and papersprite fix

This commit is contained in:
TehRealSalt 2017-10-23 17:27:00 -04:00
parent 54b8e25713
commit e7de9502ba
2 changed files with 7 additions and 7 deletions

View file

@ -6631,7 +6631,7 @@ void P_MobjThinker(mobj_t *mobj)
if (mobj->target->flags2 & MF2_DONTDRAW) if (mobj->target->flags2 & MF2_DONTDRAW)
mobj->flags2 |= MF2_DONTDRAW; mobj->flags2 |= MF2_DONTDRAW;
else else
mobj->flags2 &= !MF2_DONTDRAW; mobj->flags2 &= ~MF2_DONTDRAW;
if (mobj->target->eflags & MFE_VERTICALFLIP) if (mobj->target->eflags & MFE_VERTICALFLIP)
HEIGHT += 4*FRACUNIT; HEIGHT += 4*FRACUNIT;
@ -9230,7 +9230,7 @@ void P_SpawnPlayer(INT32 playernum)
if (mobj->flags2 & MF2_DONTDRAW) if (mobj->flags2 & MF2_DONTDRAW)
mo->flags2 |= MF2_DONTDRAW; mo->flags2 |= MF2_DONTDRAW;
else else
mo->flags2 &= !MF2_DONTDRAW; mo->flags2 &= ~MF2_DONTDRAW;
if (p->kartstuff[k_balloon] & 2) if (p->kartstuff[k_balloon] & 2)
{ {
@ -9242,7 +9242,7 @@ void P_SpawnPlayer(INT32 playernum)
if (mobj->flags2 & MF2_DONTDRAW) if (mobj->flags2 & MF2_DONTDRAW)
mo2->flags2 |= MF2_DONTDRAW; mo2->flags2 |= MF2_DONTDRAW;
else else
mo2->flags2 &= !MF2_DONTDRAW; mo2->flags2 &= ~MF2_DONTDRAW;
} }
if (p->kartstuff[k_balloon] & 4) if (p->kartstuff[k_balloon] & 4)
@ -9255,7 +9255,7 @@ void P_SpawnPlayer(INT32 playernum)
if (mobj->flags2 & MF2_DONTDRAW) if (mobj->flags2 & MF2_DONTDRAW)
mo3->flags2 |= MF2_DONTDRAW; mo3->flags2 |= MF2_DONTDRAW;
else else
mo3->flags2 &= !MF2_DONTDRAW; mo3->flags2 &= ~MF2_DONTDRAW;
} }
if (p->kartstuff[k_balloon] & 8) if (p->kartstuff[k_balloon] & 8)
@ -9268,7 +9268,7 @@ void P_SpawnPlayer(INT32 playernum)
if (mobj->flags2 & MF2_DONTDRAW) if (mobj->flags2 & MF2_DONTDRAW)
mo4->flags2 |= MF2_DONTDRAW; mo4->flags2 |= MF2_DONTDRAW;
else else
mo4->flags2 &= !MF2_DONTDRAW; mo4->flags2 &= ~MF2_DONTDRAW;
} }
if (p->kartstuff[k_balloon] & 16) if (p->kartstuff[k_balloon] & 16)
@ -9281,7 +9281,7 @@ void P_SpawnPlayer(INT32 playernum)
if (mobj->flags2 & MF2_DONTDRAW) if (mobj->flags2 & MF2_DONTDRAW)
mo5->flags2 |= MF2_DONTDRAW; mo5->flags2 |= MF2_DONTDRAW;
else else
mo5->flags2 &= !MF2_DONTDRAW; mo5->flags2 &= ~MF2_DONTDRAW;
} }
} }
} }

View file

@ -1249,7 +1249,7 @@ static void R_ProjectSprite(mobj_t *thing)
offset2 = FixedMul(spritecachedinfo[lump].width, this_scale); offset2 = FixedMul(spritecachedinfo[lump].width, this_scale);
tx += FixedMul(offset2, ang_scale); tx += FixedMul(offset2, ang_scale);
x2 = ((centerxfrac + FixedMul (tx,xscale)) >>FRACBITS) - 1; x2 = ((centerxfrac + FixedMul (tx,xscale)) >> FRACBITS) - (papersprite ? 2 : 1);
// off the left side // off the left side
if (x2 < 0) if (x2 < 0)