Have Minus rotate in mid-air
This commit is contained in:
parent
d99e3f8337
commit
9a7979d841
|
@ -4969,14 +4969,10 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
|
||||||
"S_MINUS_BURST4",
|
"S_MINUS_BURST4",
|
||||||
"S_MINUS_BURST5",
|
"S_MINUS_BURST5",
|
||||||
"S_MINUS_POPUP",
|
"S_MINUS_POPUP",
|
||||||
"S_MINUS_UPWARD1",
|
"S_MINUS_AERIAL1",
|
||||||
"S_MINUS_UPWARD2",
|
"S_MINUS_AERIAL2",
|
||||||
"S_MINUS_UPWARD3",
|
"S_MINUS_AERIAL3",
|
||||||
"S_MINUS_UPWARD4",
|
"S_MINUS_AERIAL4",
|
||||||
"S_MINUS_DOWNWARD1",
|
|
||||||
"S_MINUS_DOWNWARD2",
|
|
||||||
"S_MINUS_DOWNWARD3",
|
|
||||||
"S_MINUS_DOWNWARD4",
|
|
||||||
|
|
||||||
// Minus dirt
|
// Minus dirt
|
||||||
"S_MINUSDIRT1",
|
"S_MINUSDIRT1",
|
||||||
|
|
14
src/info.c
14
src/info.c
|
@ -1074,15 +1074,11 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_MNUD, 2|FF_ANIMATE, 5, {NULL}, 1, 2, S_MINUS_BURST4}, // S_MINUS_BURST3
|
{SPR_MNUD, 2|FF_ANIMATE, 5, {NULL}, 1, 2, S_MINUS_BURST4}, // S_MINUS_BURST3
|
||||||
{SPR_MNUD, 3|FF_ANIMATE, 5, {NULL}, 1, 2, S_MINUS_BURST5}, // S_MINUS_BURST4
|
{SPR_MNUD, 3|FF_ANIMATE, 5, {NULL}, 1, 2, S_MINUS_BURST5}, // S_MINUS_BURST4
|
||||||
{SPR_MNUD, 4|FF_ANIMATE, 5, {NULL}, 1, 2, S_MINUSDIRT2}, // S_MINUS_BURST5
|
{SPR_MNUD, 4|FF_ANIMATE, 5, {NULL}, 1, 2, S_MINUSDIRT2}, // S_MINUS_BURST5
|
||||||
{SPR_MNUS, 3, 1, {A_MinusPopup}, 0, 0, S_MINUS_UPWARD1}, // S_MINUS_POPUP
|
{SPR_MNUS, 3, 1, {A_MinusPopup}, 0, 0, S_MINUS_AERIAL1}, // S_MINUS_POPUP
|
||||||
{SPR_MNUS, 0, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD2}, // S_MINUS_UPWARD1
|
{SPR_MNUS, 0, 1, {A_MinusCheck}, 0, 0, S_MINUS_AERIAL2}, // S_MINUS_AERIAL1
|
||||||
{SPR_MNUS, 1, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD3}, // S_MINUS_UPWARD2
|
{SPR_MNUS, 1, 1, {A_MinusCheck}, 0, 0, S_MINUS_AERIAL3}, // S_MINUS_AERIAL2
|
||||||
{SPR_MNUS, 2, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD4}, // S_MINUS_UPWARD3
|
{SPR_MNUS, 2, 1, {A_MinusCheck}, 0, 0, S_MINUS_AERIAL4}, // S_MINUS_AERIAL3
|
||||||
{SPR_MNUS, 3, 1, {A_MinusCheck}, 0, 0, S_MINUS_UPWARD1}, // S_MINUS_UPWARD4
|
{SPR_MNUS, 3, 1, {A_MinusCheck}, 0, 0, S_MINUS_AERIAL1}, // S_MINUS_AERIAL4
|
||||||
{SPR_MNUS, 4, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD2}, // S_MINUS_DOWNWARD1
|
|
||||||
{SPR_MNUS, 5, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD3}, // S_MINUS_DOWNWARD2
|
|
||||||
{SPR_MNUS, 6, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD4}, // S_MINUS_DOWNWARD3
|
|
||||||
{SPR_MNUS, 7, 1, {A_MinusCheck}, 0, 0, S_MINUS_DOWNWARD1}, // S_MINUS_DOWNWARD4
|
|
||||||
|
|
||||||
{SPR_MNUD, FF_ANIMATE, 6, {NULL}, 1, 5, S_MINUSDIRT2}, // S_MINUSDIRT1
|
{SPR_MNUD, FF_ANIMATE, 6, {NULL}, 1, 5, S_MINUSDIRT2}, // S_MINUSDIRT1
|
||||||
{SPR_MNUD, 5, 8, {NULL}, 3, 5, S_MINUSDIRT3}, // S_MINUSDIRT2
|
{SPR_MNUD, 5, 8, {NULL}, 3, 5, S_MINUSDIRT3}, // S_MINUSDIRT2
|
||||||
|
|
12
src/info.h
12
src/info.h
|
@ -1270,14 +1270,10 @@ typedef enum state
|
||||||
S_MINUS_BURST4,
|
S_MINUS_BURST4,
|
||||||
S_MINUS_BURST5,
|
S_MINUS_BURST5,
|
||||||
S_MINUS_POPUP,
|
S_MINUS_POPUP,
|
||||||
S_MINUS_UPWARD1,
|
S_MINUS_AERIAL1,
|
||||||
S_MINUS_UPWARD2,
|
S_MINUS_AERIAL2,
|
||||||
S_MINUS_UPWARD3,
|
S_MINUS_AERIAL3,
|
||||||
S_MINUS_UPWARD4,
|
S_MINUS_AERIAL4,
|
||||||
S_MINUS_DOWNWARD1,
|
|
||||||
S_MINUS_DOWNWARD2,
|
|
||||||
S_MINUS_DOWNWARD3,
|
|
||||||
S_MINUS_DOWNWARD4,
|
|
||||||
|
|
||||||
// Minus dirt
|
// Minus dirt
|
||||||
S_MINUSDIRT1,
|
S_MINUSDIRT1,
|
||||||
|
|
10
src/p_mobj.c
10
src/p_mobj.c
|
@ -9709,6 +9709,16 @@ void P_MobjThinker(mobj_t *mobj)
|
||||||
#undef DRAGONTURNSPEED
|
#undef DRAGONTURNSPEED
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case MT_MINUS:
|
||||||
|
#ifdef ROTSPRITE
|
||||||
|
{
|
||||||
|
if (P_IsObjectOnGround(mobj))
|
||||||
|
mobj->rollangle = 0;
|
||||||
|
else
|
||||||
|
mobj->rollangle = R_PointToAngle2(0, 0, mobj->momz, (mobj->scale << 1) - min(abs(mobj->momz), mobj->scale << 1));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
case MT_SPINFIRE:
|
case MT_SPINFIRE:
|
||||||
if (mobj->flags & MF_NOGRAVITY)
|
if (mobj->flags & MF_NOGRAVITY)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue