From 7c793096f1aa5cde309fecd0af213a5aa14524e2 Mon Sep 17 00:00:00 2001 From: VelocitOni Date: Tue, 29 Jul 2025 01:27:06 -0400 Subject: [PATCH] Modernize BallhogBoom animation states Cut down BallhogBoom states into 1 nice FF_ANIMATE because it's so old, changed all BALLHOGBOOM1s to just BALLHOGBOOM --- src/info.c | 17 +---------------- src/info.h | 17 +---------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/info.c b/src/info.c index 86f27594a..e5ff38dbb 100644 --- a/src/info.c +++ b/src/info.c @@ -2511,22 +2511,7 @@ state_t states[NUMSTATES] = {SPR_BHOG, 6, 1, {NULL}, 0, 0, S_BALLHOG8}, // S_BALLHOG7 {SPR_BHOG, 7, 1, {NULL}, 0, 0, S_BALLHOG1}, // S_BALLHOG8 {SPR_NULL, 0, 1, {A_BallhogExplode}, 0, 0, S_NULL}, // S_BALLHOG_DEAD - {SPR_BHBM, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_BALLHOGBOOM2}, // S_BALLHOGBOOM1 - {SPR_BHBM, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_BALLHOGBOOM3}, // S_BALLHOGBOOM2 - {SPR_BHBM, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_BALLHOGBOOM4}, // S_BALLHOGBOOM3 - {SPR_BHBM, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_BALLHOGBOOM5}, // S_BALLHOGBOOM4 - {SPR_BHBM, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_BALLHOGBOOM6}, // S_BALLHOGBOOM5 - {SPR_BHBM, FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_BALLHOGBOOM7}, // S_BALLHOGBOOM6 - {SPR_BHBM, FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_BALLHOGBOOM8}, // S_BALLHOGBOOM7 - {SPR_BHBM, FF_FULLBRIGHT|7, 1, {NULL}, 0, 0, S_BALLHOGBOOM9}, // S_BALLHOGBOOM8 - {SPR_BHBM, FF_FULLBRIGHT|8, 1, {NULL}, 0, 0, S_BALLHOGBOOM10}, // S_BALLHOGBOOM9 - {SPR_BHBM, FF_FULLBRIGHT|9, 1, {NULL}, 0, 0, S_BALLHOGBOOM11}, // S_BALLHOGBOOM10 - {SPR_BHBM, FF_FULLBRIGHT|10, 1, {NULL}, 0, 0, S_BALLHOGBOOM12}, // S_BALLHOGBOOM11 - {SPR_BHBM, FF_FULLBRIGHT|11, 1, {NULL}, 0, 0, S_BALLHOGBOOM13}, // S_BALLHOGBOOM12 - {SPR_BHBM, FF_FULLBRIGHT|12, 1, {NULL}, 0, 0, S_BALLHOGBOOM14}, // S_BALLHOGBOOM13 - {SPR_BHBM, FF_FULLBRIGHT|13, 1, {NULL}, 0, 0, S_BALLHOGBOOM15}, // S_BALLHOGBOOM14 - {SPR_BHBM, FF_FULLBRIGHT|14, 1, {NULL}, 0, 0, S_BALLHOGBOOM16}, // S_BALLHOGBOOM15 - {SPR_BHBM, FF_FULLBRIGHT|15, 1, {NULL}, 0, 0, S_NULL}, // S_BALLHOGBOOM16 + {SPR_BHBM, FF_ANIMATE|FF_FULLBRIGHT, 27, {NULL}, 26, 1, S_NULL}, // S_BALLHOG_BOOM {SPR_BHGR, FF_ANIMATE|FF_FULLBRIGHT|0, 2*TICRATE, {NULL}, 5, 3, S_NULL}, // S_BALLHOG_RETICULE {SPR_SPBM, 0, 1, {NULL}, 0, 0, S_SPB2}, // S_SPB1 diff --git a/src/info.h b/src/info.h index dd99ca9c4..8399084c6 100644 --- a/src/info.h +++ b/src/info.h @@ -3001,22 +3001,7 @@ typedef enum state S_BALLHOG7, S_BALLHOG8, S_BALLHOG_DEAD, - S_BALLHOGBOOM1, - S_BALLHOGBOOM2, - S_BALLHOGBOOM3, - S_BALLHOGBOOM4, - S_BALLHOGBOOM5, - S_BALLHOGBOOM6, - S_BALLHOGBOOM7, - S_BALLHOGBOOM8, - S_BALLHOGBOOM9, - S_BALLHOGBOOM10, - S_BALLHOGBOOM11, - S_BALLHOGBOOM12, - S_BALLHOGBOOM13, - S_BALLHOGBOOM14, - S_BALLHOGBOOM15, - S_BALLHOGBOOM16, + S_BALLHOGBOOM, S_BALLHOG_RETICULE, // Self-Propelled Bomb