Skip to content
Snippets Groups Projects
Commit d9a78c50 authored by MascaraSnake's avatar MascaraSnake
Browse files

Merge branch 'defuse-minecarts' into 'next' 

Defuse minecarts

See merge request !776
parents 1d2f6c95 aeab33ee
1 merge request!776Defuse minecarts
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
src/info.c
+ 1
− 1
View file @ d9a78c50
...@@ -2395,7 +2395,7 @@ state_t states[NUMSTATES] = ...@@ -2395,7 +2395,7 @@ state_t states[NUMSTATES] =
   
// Minecart // Minecart
{SPR_NULL, 0, 1, {NULL}, 0, 0, S_MINECART_IDLE}, // S_MINECART_IDLE {SPR_NULL, 0, 1, {NULL}, 0, 0, S_MINECART_IDLE}, // S_MINECART_IDLE
{SPR_NULL, 0, 0, {A_KillSegments}, 0, 0, S_TNTBARREL_EXPL3}, // S_MINECART_DTH1 {SPR_NULL, 0, 0, {A_KillSegments}, 0, 0, S_TNTBARREL_EXPL4}, // S_MINECART_DTH1
{SPR_MCRT, 8|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_MINECARTEND {SPR_MCRT, 8|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_MINECARTEND
{SPR_MCRT, 0|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_MINECARTSEG_FRONT {SPR_MCRT, 0|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_MINECARTSEG_FRONT
{SPR_MCRT, 1|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_MINECARTSEG_BACK {SPR_MCRT, 1|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_MINECARTSEG_BACK
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment