stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-05 17:32:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Bounce Droneman within hitbox instead of floorz

Browse source 
* Correct Droneman hiding so he always stays within hitbox even when invisible
This commit is contained in:
mazmazz 2018-08-11 02:03:44 -04:00
parent d1a8e0baa0
commit d0f0f475ce
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/info.c
View file

@ -16134,7 +16134,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
1000, // mass
0, // damage
sfx_ideya, // activesound
MF_SPECIAL, // flags
MF_NOGRAVITY|MF_SPECIAL, // flags
S_NULL // raisestate
},

25
src/p_mobj.c
View file

@ -7871,13 +7871,11 @@ void P_MobjThinker(mobj_t *mobj)
// Bouncy bouncy!
droneman->angle += ANG10;
if (droneman->flags2 & MF2_DONTDRAW)
droneman->momz = 0;
else if (!(droneman->flags2 & MF2_OBJECTFLIP)
&& droneman->z <= droneman->floorz)
if (!(droneman->flags2 & MF2_OBJECTFLIP)
&& droneman->z <= mobj->z)
droneman->momz = FixedMul(5*FRACUNIT, droneman->scale);
else if ((droneman->flags2 & MF2_OBJECTFLIP)
&& droneman->z >= droneman->ceilingz - droneman->height)
&& droneman->z + droneman->height >= mobj->z + mobj->height)
droneman->momz = FixedMul(-5*FRACUNIT, droneman->scale);
for (i = 0; i < MAXPLAYERS; i++)
@ -7890,8 +7888,8 @@ void P_MobjThinker(mobj_t *mobj)
if (bonustime)
{
CONS_Debug(DBG_NIGHTSBASIC, "Adding goal post\n");
if (droneman && droneman->state != &states[S_INVISIBLE])
P_SetMobjState(droneman, S_INVISIBLE);
if (droneman && !(droneman->flags2 & MF2_DONTDRAW))
droneman->flags2 |= MF2_DONTDRAW;
if (goalpost && goalpost->state == &states[S_INVISIBLE])
P_SetMobjState(goalpost, mobjinfo[goalpost->type].meleestate);
if (sparkle && sparkle->state == &states[S_INVISIBLE])
@ -7913,14 +7911,19 @@ void P_MobjThinker(mobj_t *mobj)
P_SetMobjState(goalpost, S_INVISIBLE);
if (sparkle && sparkle->state != &states[S_INVISIBLE])
P_SetMobjState(sparkle, S_INVISIBLE);
if (droneman && droneman->state == &states[S_INVISIBLE])
P_SetMobjState(droneman, mobjinfo[droneman->type].meleestate);
if (droneman)
{
if (droneman->state != &states[mobjinfo[droneman->type].meleestate])
P_SetMobjState(droneman, mobjinfo[droneman->type].meleestate);
if (droneman->flags2 & MF2_DONTDRAW)
droneman->flags2 &= ~MF2_DONTDRAW;
}
}
else
{
// else, hide it
if (droneman && droneman->state != &states[S_INVISIBLE])
P_SetMobjState(droneman, S_INVISIBLE);
if (droneman && !(droneman->flags2 & MF2_DONTDRAW))
droneman->flags2 |= MF2_DONTDRAW;
}
}
}