From 7aec2b0732acaacc9e8a6ea3aad195af6a9b8e32 Mon Sep 17 00:00:00 2001 From: VelocitOni Date: Sun, 16 Jul 2023 02:27:25 -0400 Subject: [PATCH] 10th frame of hitsparks added Added biggest frame of hitsparks, only 1 to go now. --- src/deh_tables.c | 2 ++ src/info.c | 2 ++ src/info.h | 2 ++ src/k_hitlag.h | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/deh_tables.c b/src/deh_tables.c index 59af77da5..da5a89db2 100644 --- a/src/deh_tables.c +++ b/src/deh_tables.c @@ -4605,6 +4605,8 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi "S_HITLAG_6", "S_HITLAG_8", "S_HITLAG_9", + "S_HITLAG_10", + // Broly Ki Orb "S_BROLY1", diff --git a/src/info.c b/src/info.c index 94974dde9..52982babe 100644 --- a/src/info.c +++ b/src/info.c @@ -581,6 +581,7 @@ char sprnames[NUMSPRITES + 1][5] = "HFX6", // Hitlag stage 6 "HFX8", // Hitlag stage 8 "HFX9", // Hitlag stage 9 + "HFXX", // Hitlag stage 10 // Kart Items "RSHE", // Rocket sneaker @@ -5320,6 +5321,7 @@ state_t states[NUMSTATES] = {SPR_HFX6, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 6, {NULL}, 5, 1, S_NULL}, // S_HITLAG_6 {SPR_HFX8, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 8, {NULL}, 7, 1, S_NULL}, // S_HITLAG_8 {SPR_HFX9, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 9, {NULL}, 8, 1, S_NULL}, // S_HITLAG_9 + {SPR_HFXX, FF_FULLBRIGHT|FF_PAPERSPRITE|FF_ANIMATE, 10, {NULL}, 9, 1, S_NULL}, // S_HITLAG_10 // Broly Ki Orb {SPR_LSSJ, FF_REVERSESUBTRACT|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_BROLY2}, // S_BROLY1 diff --git a/src/info.h b/src/info.h index 7cd3cc354..2ac97cc1c 100644 --- a/src/info.h +++ b/src/info.h @@ -1132,6 +1132,7 @@ typedef enum sprite SPR_HFX6, // Hitlag stage 6 SPR_HFX8, // Hitlag stage 8 SPR_HFX9, // Hitlag stage 9 + SPR_HFXX, // Hitlag stage 10 // Kart Items SPR_RSHE, // Rocket sneaker @@ -5750,6 +5751,7 @@ typedef enum state S_HITLAG_6, S_HITLAG_8, S_HITLAG_9, + S_HITLAG_10, // Broly Ki Orb S_BROLY1, diff --git a/src/k_hitlag.h b/src/k_hitlag.h index 02dedfc2a..cace7a964 100644 --- a/src/k_hitlag.h +++ b/src/k_hitlag.h @@ -22,7 +22,7 @@ extern "C" { #define MAXHITLAGTICS (30) #define HITLAGJITTERS (FRACUNIT / 20) -#define NUM_HITLAG_STATES (8) +#define NUM_HITLAG_STATES (9) /*-------------------------------------------------- void K_AddHitLag(mobj_t *mo, INT32 tics, boolean fromDamage);