From b7ee88fcd9a8fce8545c0ef453461bf086ff3bcd Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Wed, 21 May 2025 20:41:52 -0400 Subject: [PATCH] New bubble trap sprites --- src/info.c | 3 ++- src/info.h | 1 + src/p_mobj.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/info.c b/src/info.c index 15ea02dd9..c33e6b943 100644 --- a/src/info.c +++ b/src/info.c @@ -380,6 +380,7 @@ char sprnames[NUMSPRITES + 1][5] = "THNA", // Lightning Shield Top Swoosh "THNB", // Lightning Shield Bottom Swoosh "BUBS", // Bubble Shield (not Bubs) + "BUBT", // Bubble Shield trap "BUBA", // Bubble Shield Outline "BUBB", // Bubble Shield Top Wave "BUBC", // Bubble Shield Bottom Wave @@ -2570,7 +2571,7 @@ state_t states[NUMSTATES] = {SPR_BUBS, FF_FULLBRIGHT|8, 2, {NULL}, 0, 0, S_BUBBLESHIELD18}, // S_BUBBLESHIELD17 {SPR_BUBS, FF_FULLBRIGHT|13, 2, {NULL}, 0, 0, S_BUBBLESHIELD1}, // S_BUBBLESHIELD18 {SPR_BUBS, FF_FULLBRIGHT|13, -1, {NULL}, 0, 0, S_BUBBLESHIELDBLOWUP}, // S_BUBBLESHIELDBLOWUP - {SPR_BUBS, FF_FULLBRIGHT|13, 2, {NULL}, 0, 0, S_BUBBLESHIELDTRAP2}, // S_BUBBLESHIELDTRAP1 + {SPR_BUBT, FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 7, 3, S_NULL}, // S_BUBBLESHIELDTRAP1 {SPR_BUBS, FF_FULLBRIGHT|14, 2, {NULL}, 0, 0, S_BUBBLESHIELDTRAP3}, // S_BUBBLESHIELDTRAP2 {SPR_BUBS, FF_FULLBRIGHT|15, 2, {NULL}, 0, 0, S_BUBBLESHIELDTRAP4}, // S_BUBBLESHIELDTRAP3 {SPR_BUBS, FF_FULLBRIGHT|14, 2, {NULL}, 0, 0, S_BUBBLESHIELDTRAP5}, // S_BUBBLESHIELDTRAP4 diff --git a/src/info.h b/src/info.h index 2519259e8..d7495e852 100644 --- a/src/info.h +++ b/src/info.h @@ -919,6 +919,7 @@ typedef enum sprite SPR_THNA, // Lightning Shield Top Swoosh SPR_THNB, // Lightning Shield Bottom Swoosh SPR_BUBS, // Bubble Shield (not Bubs) + SPR_BUBT, // Bubble Shield trap SPR_BUBA, // Bubble Shield Outline SPR_BUBB, // Bubble Shield Top Wave SPR_BUBC, // Bubble Shield Bottom Wave diff --git a/src/p_mobj.c b/src/p_mobj.c index baceb1aed..d6782f179 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -9585,7 +9585,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) mobj->cvmem /= 2; mobj->momz = 0; - mobj->destscale = ((5*mobj->tracer->scale)>>2) + (mobj->tracer->scale>>3); + mobj->destscale = ((8*mobj->tracer->scale)>>2) + (mobj->tracer->scale>>3); mobj->tracer->momz = (8*mobj->tracer->scale) * P_MobjFlip(mobj->tracer); @@ -9656,7 +9656,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj) } else { - mobj->destscale = (5*mapobjectscale)>>2; + mobj->destscale = (8*mapobjectscale)>>2; if (mobj->threshold > 0) mobj->threshold--;