mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-02-27 22:20:49 +00:00
Merge branch 'tnt-is-laggy' into 'next'
Make flying TNTs' explosions not so laggy the first time See merge request STJr/SRB2!746
This commit is contained in:
commit
c069cf94bc
2 changed files with 8 additions and 6 deletions
13
src/info.c
13
src/info.c
|
@ -2343,12 +2343,13 @@ state_t states[NUMSTATES] =
|
||||||
|
|
||||||
// TNT barrel
|
// TNT barrel
|
||||||
{SPR_BARR, 0, -1, {NULL}, 0, 0, S_NULL}, // S_TNTBARREL_STND1
|
{SPR_BARR, 0, -1, {NULL}, 0, 0, S_NULL}, // S_TNTBARREL_STND1
|
||||||
{SPR_BARX, 0|FF_FULLBRIGHT, 3, {A_SetObjectFlags}, MF_NOCLIP|MF_NOGRAVITY|MF_NOBLOCKMAP, 0, S_TNTBARREL_EXPL2}, // S_TNTBARREL_EXPL1
|
{SPR_BARX, 0, 0, {A_RollAngle}, 0, 1, S_TNTBARREL_EXPL2}, // S_TNTBARREL_EXPL1
|
||||||
{SPR_BARX, 1|FF_FULLBRIGHT, 2, {A_TNTExplode}, MT_TNTDUST, 0, S_TNTBARREL_EXPL3}, // S_TNTBARREL_EXPL2
|
{SPR_BARX, 0|FF_FULLBRIGHT, 3, {A_SetObjectFlags}, MF_NOCLIP|MF_NOGRAVITY|MF_NOBLOCKMAP, 0, S_TNTBARREL_EXPL3}, // S_TNTBARREL_EXPL2
|
||||||
{SPR_BARX, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_TNTBARREL_EXPL4}, // S_TNTBARREL_EXPL3
|
{SPR_BARX, 1|FF_FULLBRIGHT, 2, {A_TNTExplode}, MT_TNTDUST, 0, S_TNTBARREL_EXPL4}, // S_TNTBARREL_EXPL3
|
||||||
{SPR_BARX, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL5}, // S_TNTBARREL_EXPL4
|
{SPR_BARX, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_TNTBARREL_EXPL5}, // S_TNTBARREL_EXPL4
|
||||||
{SPR_BARX, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL6}, // S_TNTBARREL_EXPL5
|
{SPR_BARX, 2|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL6}, // S_TNTBARREL_EXPL5
|
||||||
{SPR_NULL, 0, 35, {NULL}, 0, 0, S_NULL}, // S_TNTBARREL_EXPL6
|
{SPR_BARX, 3|FF_FULLBRIGHT, 3, {NULL}, 0, 0, S_TNTBARREL_EXPL7}, // S_TNTBARREL_EXPL6
|
||||||
|
{SPR_NULL, 0, 35, {NULL}, 0, 0, S_NULL}, // S_TNTBARREL_EXPL7
|
||||||
#ifndef ROTSPRITE
|
#ifndef ROTSPRITE
|
||||||
{SPR_BARR, 1|FF_ANIMATE, -1, {NULL}, 7, 2, S_NULL}, // S_TNTBARREL_FLYING
|
{SPR_BARR, 1|FF_ANIMATE, -1, {NULL}, 7, 2, S_NULL}, // S_TNTBARREL_FLYING
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -2503,6 +2503,7 @@ typedef enum state
|
||||||
S_TNTBARREL_EXPL4,
|
S_TNTBARREL_EXPL4,
|
||||||
S_TNTBARREL_EXPL5,
|
S_TNTBARREL_EXPL5,
|
||||||
S_TNTBARREL_EXPL6,
|
S_TNTBARREL_EXPL6,
|
||||||
|
S_TNTBARREL_EXPL7,
|
||||||
S_TNTBARREL_FLYING,
|
S_TNTBARREL_FLYING,
|
||||||
|
|
||||||
// TNT proximity shell
|
// TNT proximity shell
|
||||||
|
|
Loading…
Reference in a new issue