Merge branch 'saloondoor-fix' into 'next'
Fix saloon doors not letting players through when marked with the Ambush flag See merge request STJr/SRB2!600
This commit is contained in:
commit
c46bfa2be9
|
@ -14225,7 +14225,7 @@ void A_SaloonDoorSpawn(mobj_t *actor)
|
||||||
fixed_t c = FINECOSINE(fa)*locvar2;
|
fixed_t c = FINECOSINE(fa)*locvar2;
|
||||||
fixed_t s = FINESINE(fa)*locvar2;
|
fixed_t s = FINESINE(fa)*locvar2;
|
||||||
mobj_t *door;
|
mobj_t *door;
|
||||||
mobjflag2_t ambush = (actor->flags & MF2_AMBUSH);
|
mobjflag2_t ambush = (actor->flags2 & MF2_AMBUSH);
|
||||||
|
|
||||||
#ifdef HAVE_BLUA
|
#ifdef HAVE_BLUA
|
||||||
if (LUA_CallAction("A_SaloonDoorSpawn", actor))
|
if (LUA_CallAction("A_SaloonDoorSpawn", actor))
|
||||||
|
|
|
@ -995,7 +995,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
||||||
if (thing->type == MT_SALOONDOOR && tmthing->player)
|
if (thing->type == MT_SALOONDOOR && tmthing->player)
|
||||||
{
|
{
|
||||||
mobj_t *ref = (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)) ? tmthing->tracer : tmthing;
|
mobj_t *ref = (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)) ? tmthing->tracer : tmthing;
|
||||||
if ((thing->flags & MF2_AMBUSH) || ref != tmthing)
|
if ((thing->flags2 & MF2_AMBUSH) || ref != tmthing)
|
||||||
{
|
{
|
||||||
fixed_t dm = min(FixedHypot(ref->momx, ref->momy), 16*FRACUNIT);
|
fixed_t dm = min(FixedHypot(ref->momx, ref->momy), 16*FRACUNIT);
|
||||||
angle_t ang = R_PointToAngle2(0, 0, ref->momx, ref->momy) - thing->angle;
|
angle_t ang = R_PointToAngle2(0, 0, ref->momx, ref->momy) - thing->angle;
|
||||||
|
@ -1008,7 +1008,7 @@ static boolean PIT_CheckThing(mobj_t *thing)
|
||||||
|
|
||||||
if (thing->type == MT_SALOONDOORCENTER && tmthing->player)
|
if (thing->type == MT_SALOONDOORCENTER && tmthing->player)
|
||||||
{
|
{
|
||||||
if ((thing->flags & MF2_AMBUSH) || (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)))
|
if ((thing->flags2 & MF2_AMBUSH) || (tmthing->player->powers[pw_carry] == CR_MINECART && tmthing->tracer && !P_MobjWasRemoved(tmthing->tracer)))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue