From 4e926d346676639fe78972ad9389d58ce72829e4 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Fri, 31 Jan 2025 03:06:58 -0500 Subject: [PATCH 1/3] Ring rework 1 --- src/d_player.h | 7 ++-- src/k_hud.c | 94 ++++++++++++++++++++++++++++++++++---------------- src/k_kart.c | 49 +------------------------- src/p_enemy.c | 13 +++++++ src/p_spec.c | 4 +-- 5 files changed, 82 insertions(+), 85 deletions(-) diff --git a/src/d_player.h b/src/d_player.h index c80719096..58eae563d 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -91,7 +91,7 @@ typedef enum PF_NOCONTEST = 1<<11, // Did not finish (last place explosion) PF_LOSTLIFE = 1<<12, // Do not lose life more than once - PF_RINGLOCK = 1<<13, // Prevent picking up rings while SPB is locked on + PF_RINGLOCK = 1<<13, // Prevent picking up rings while locked. Mostly for lua use since SPB no longer locks PF_DRIFTINPUT = 1<<14, // Drifting! PF_GETSPARKS = 1<<15, // Can get sparks @@ -233,10 +233,7 @@ typedef enum khud_itemblinkmode, // Type of flashing: 0 = white (normal), 1 = red (mashing), 2 = rainbow (enhanced items) // Rings - khud_ringframe, // Ring spin frame - khud_ringtics, // Tics left until next ring frame - khud_ringdelay, // Next frame's tics - khud_ringspblock, // Which frame of the SPB ring lock animation to use + khud_ringlock, // Ring lock // Lap finish khud_lapanimation, // Used to show the lap start wing logo animation diff --git a/src/k_hud.c b/src/k_hud.c index ca8520582..036fb8b24 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -81,13 +81,12 @@ static patch_t *kp_spbminimap; static patch_t *kp_itemboxminimap; static patch_t *kp_ringsticker[2]; -static patch_t *kp_ringstickersplit[4]; +static patch_t *kp_ringbit[2]; +/*static patch_t *kp_ringstickersplit[4]; static patch_t *kp_ring[6]; -static patch_t *kp_smallring[6]; +static patch_t *kp_smallring[6];*/ static patch_t *kp_ringdebtminus; -static patch_t *kp_ringdebtminussmall; -static patch_t *kp_ringspblock[16]; -static patch_t *kp_ringspblocksmall[16]; +//static patch_t *kp_ringdebtminussmall; static patch_t *kp_speedometersticker; static patch_t *kp_speedometerlabel[4]; @@ -268,7 +267,9 @@ void K_LoadKartHUDGraphics(void) HU_UpdatePatch(&kp_itemboxminimap, "K_ITMMM"); // Rings & Lives - HU_UpdatePatch(&kp_ringsticker[0], "RNGBACKA"); + HU_UpdatePatch(&kp_ringsticker[0], "K_RNGHD"); + HU_UpdatePatch(&kp_ringbit[0], "K_RNGH1"); + /*HU_UpdatePatch(&kp_ringsticker[0], "RNGBACKA"); HU_UpdatePatch(&kp_ringsticker[1], "RNGBACKB"); sprintf(buffer, "K_RINGx"); @@ -276,19 +277,11 @@ void K_LoadKartHUDGraphics(void) { buffer[6] = '0'+(i+1); HU_UpdatePatch(&kp_ring[i], "%s", buffer); - } + } */ - HU_UpdatePatch(&kp_ringdebtminus, "RDEBTMIN"); + HU_UpdatePatch(&kp_ringdebtminus, "K_RNGDM"); - sprintf(buffer, "SPBRNGxx"); - for (i = 0; i < 16; i++) - { - buffer[6] = '0'+((i+1) / 10); - buffer[7] = '0'+((i+1) % 10); - HU_UpdatePatch(&kp_ringspblock[i], "%s", buffer); - } - - HU_UpdatePatch(&kp_ringstickersplit[0], "SMRNGBGA"); + /*HU_UpdatePatch(&kp_ringstickersplit[0], "SMRNGBGA"); HU_UpdatePatch(&kp_ringstickersplit[1], "SMRNGBGB"); sprintf(buffer, "K_SRINGx"); @@ -306,7 +299,7 @@ void K_LoadKartHUDGraphics(void) buffer[6] = '0'+((i+1) / 10); buffer[7] = '0'+((i+1) % 10); HU_UpdatePatch(&kp_ringspblocksmall[i], "%s", buffer); - } + }*/ // Speedometer HU_UpdatePatch(&kp_speedometersticker, "K_SPDMBG"); @@ -2128,8 +2121,7 @@ void K_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, IN static void K_drawKartLapsAndRings(void) { const boolean uselives = G_GametypeUsesLives(); - SINT8 ringanim_realframe = stplyr->karthud[khud_ringframe]; - INT32 splitflags = V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_SPLITSCREEN; + INT32 splitflags = V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_HUDTRANS|V_SPLITSCREEN; UINT8 rn[2]; INT32 ringflip = 0; UINT8 *ringmap = NULL; @@ -2141,7 +2133,7 @@ static void K_drawKartLapsAndRings(void) if (!ringsdisabled) { - + if (stplyr->rings <= 0 && (leveltime/5 & 1)) // In debt { ringmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_CRIMSON, GTC_CACHE); @@ -2150,12 +2142,12 @@ static void K_drawKartLapsAndRings(void) else if (stplyr->rings >= 20) // Maxed out ringmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_YELLOW, GTC_CACHE); - if (stplyr->karthud[khud_ringframe] > RINGANIM_FLIPFRAME) + /*if (stplyr->karthud[khud_ringframe] > RINGANIM_FLIPFRAME) { ringflip = V_FLIP; ringanim_realframe = RINGANIM_NUMFRAMES-stplyr->karthud[khud_ringframe]; ringx += SHORT((r_splitscreen > 1) ? kp_smallring[ringanim_realframe]->width : kp_ring[ringanim_realframe]->width); - } + }*/ } if (r_splitscreen > 1) @@ -2189,8 +2181,8 @@ static void K_drawKartLapsAndRings(void) fr = fx; // Laps - if (!ringsdisabled) - V_DrawScaledPatch(fx-2 + (flipflag ? (SHORT(kp_ringstickersplit[1]->width) - 3) : 0), fy, V_HUDTRANS|splitflags|flipflag, kp_ringstickersplit[0]); + /*if (!ringsdisabled) + V_DrawScaledPatch(fx-2 + (flipflag ? (SHORT(kp_ringstickersplit[1]->width) - 3) : 0), fy, V_HUDTRANS|splitflags|flipflag, kp_ringstickersplit[0]);*/ V_DrawScaledPatch(fx, fy, V_HUDTRANS|splitflags, kp_splitlapflag); V_DrawScaledPatch(fx+22, fy, V_HUDTRANS|splitflags, frameslash); @@ -2218,6 +2210,7 @@ static void K_drawKartLapsAndRings(void) if (!ringsdisabled) { + /* // Rings if (!uselives) { @@ -2240,6 +2233,7 @@ static void K_drawKartLapsAndRings(void) // SPB ring lock if (stplyr->pflags & PF_RINGLOCK) V_DrawScaledPatch(fr-12, fy-23, V_HUDTRANS|splitflags, kp_ringspblocksmall[stplyr->karthud[khud_ringspblock]]); + */ } // Lives @@ -2263,6 +2257,49 @@ static void K_drawKartLapsAndRings(void) if (!ringsdisabled) { + SINT8 i; + V_DrawScaledPatch(LAPS_X, LAPS_Y-14, V_HUDTRANS|splitflags, kp_ringsticker[0]); + + if (stplyr->rings < 0) // Draw the minus for ring debt + { + V_DrawMappedPatch(LAPS_X-5, LAPS_Y-11, V_HUDTRANS|splitflags, kp_ringdebtminus, ringmap); + V_DrawMappedPatch(LAPS_X+2, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[0]], ringmap); + V_DrawMappedPatch(LAPS_X+8, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[1]], ringmap); + } + else + { + V_DrawMappedPatch(LAPS_X+2, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[0]], ringmap); + V_DrawMappedPatch(LAPS_X+8, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[1]], ringmap); + } + + // Draw the fillbars + if (stplyr->rings) + { + SINT8 ringcount = stplyr->rings; + SINT8 barcolors[4] = {66,83,65}; + boolean indebt = false; + + if (stplyr->rings < 0) + { + barcolors[0] = 35; + barcolors[1] = 33; + barcolors[2] = 37; + ringcount = -ringcount; + indebt = true; + } + if (!indebt || (indebt && (leveltime/5 & 1))) + { + for (i = 0; i != ringcount; i++) + { + + V_DrawFill(LAPS_X+17+(2*i), LAPS_Y-10, 1, 3, barcolors[0]|splitflags); + V_DrawFill(LAPS_X+17+(2*i), LAPS_Y-9, 1, 2, barcolors[1]|splitflags); + V_DrawFill(LAPS_X+17+(2*i), LAPS_Y-6, 1, 1, barcolors[2]|splitflags); + } + } + } + + /* // Rings if (!uselives) V_DrawScaledPatch(LAPS_X, LAPS_Y-11, V_HUDTRANS|splitflags, kp_ringsticker[1]); @@ -2281,11 +2318,8 @@ static void K_drawKartLapsAndRings(void) { V_DrawMappedPatch(LAPS_X+23, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[0]], ringmap); V_DrawMappedPatch(LAPS_X+29, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[1]], ringmap); - } + }*/ - // SPB ring lock - if (stplyr->pflags & PF_RINGLOCK) - V_DrawScaledPatch(LAPS_X-5, LAPS_Y-28, V_HUDTRANS|splitflags, kp_ringspblock[stplyr->karthud[khud_ringspblock]]); } // Lives @@ -2557,7 +2591,7 @@ static void K_drawKartBumpersOrKarma(void) } } - V_DrawScaledPatch(fx-2 + (flipflag ? (SHORT(kp_ringstickersplit[1]->width) - 3) : 0), fy, V_HUDTRANS|splitflags|flipflag, kp_ringstickersplit[0]); + //V_DrawScaledPatch(fx-2 + (flipflag ? (SHORT(kp_ringstickersplit[1]->width) - 3) : 0), fy, V_HUDTRANS|splitflags|flipflag, kp_ringstickersplit[0]); V_DrawScaledPatch(fx+22, fy, V_HUDTRANS|splitflags, frameslash); if (itembreaker) diff --git a/src/k_kart.c b/src/k_kart.c index e67838efc..5650522de 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -6593,57 +6593,13 @@ void K_KartPlayerHUDUpdate(player_t *player) if (gametype == GT_RACE) { - // 0 is the fast spin animation, set at 30 tics of ring boost or higher! - if (player->ringboost >= 30) - player->karthud[khud_ringdelay] = 0; - else - player->karthud[khud_ringdelay] = ((RINGANIM_DELAYMAX+1) * (30 - player->ringboost)) / 30; - - if (player->karthud[khud_ringframe] == 0 && player->karthud[khud_ringdelay] > RINGANIM_DELAYMAX) - { - player->karthud[khud_ringframe] = 0; - player->karthud[khud_ringtics] = 0; - } - else if ((player->karthud[khud_ringtics]--) <= 0) - { - if (player->karthud[khud_ringdelay] == 0) // fast spin animation - { - player->karthud[khud_ringframe] = ((player->karthud[khud_ringframe]+2) % RINGANIM_NUMFRAMES); - player->karthud[khud_ringtics] = 0; - } - else - { - player->karthud[khud_ringframe] = ((player->karthud[khud_ringframe]+1) % RINGANIM_NUMFRAMES); - player->karthud[khud_ringtics] = min(RINGANIM_DELAYMAX, player->karthud[khud_ringdelay])-1; - } - } if (!ringsdisabled) { if (player->pflags & PF_RINGLOCK) { - UINT8 normalanim = (leveltime % 14); - UINT8 debtanim = 14 + (leveltime % 2); - - if (player->karthud[khud_ringspblock] >= 14) // debt animation - { - if ((player->rings > 0) // Get out of 0 ring animation - && (normalanim == 3 || normalanim == 10)) // on these transition frames. - player->karthud[khud_ringspblock] = normalanim; - else - player->karthud[khud_ringspblock] = debtanim; - } - else // normal animation - { - if ((player->rings <= 0) // Go into 0 ring animation - && (player->karthud[khud_ringspblock] == 1 || player->karthud[khud_ringspblock] == 8)) // on these transition frames. - player->karthud[khud_ringspblock] = debtanim; - else - player->karthud[khud_ringspblock] = normalanim; - } + player->karthud[khud_ringlock] = true; } - else - player->karthud[khud_ringspblock] = (leveltime % 14); // reset to normal anim next time } } @@ -9804,9 +9760,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground) player->flamemeter = 0; } - if (spbplace == -1 || player->position != spbplace) - player->pflags &= ~PF_RINGLOCK; // reset ring lock - if (player->growshrinktimer <= 0) player->growcancel = -1; diff --git a/src/p_enemy.c b/src/p_enemy.c index 89917e7d4..01b6f0581 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -13199,6 +13199,19 @@ void A_SPBChase(mobj_t *actor) spbplace = actor->tracer->player->position; } + if (!ringsdisabled) // Spawn rings to make up for the fact first has ring grabbing + { + if (leveltime % 12 == 0) + { + mobj_t *specialring = P_SpawnMobj(actor->x, actor->y, actor->z, MT_RING); + specialring->colorized = true; + specialring->color = SKINCOLOR_RED; + P_SetScale(specialring, 3*mapobjectscale/2); + specialring->flags |= MF_NOCLIPHEIGHT; + } + + } + dist = P_AproxDistance(P_AproxDistance(actor->x-actor->tracer->x, actor->y-actor->tracer->y), actor->z-actor->tracer->z); wspeed = FixedMul(defspeed, FRACUNIT + FixedDiv(dist-range, range)); diff --git a/src/p_spec.c b/src/p_spec.c index 64fdd23ef..897a6ac03 100644 --- a/src/p_spec.c +++ b/src/p_spec.c @@ -3987,13 +3987,13 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha && (delay <= 0 || !(leveltime % delay)) // Timing ) { - // Don't award rings while SPB is targetting you + // Don't award rings your rings are locked if (mo->player->pflags & PF_RINGLOCK) return false; if (delay <= 0 || !(leveltime % delay)) { - // Don't award rings while SPB is targetting you + // Don't award rings while your rings are locked if (mo->player->pflags & PF_RINGLOCK) return false; From b70834374d99b0c81c00a551ed592bb67481a456 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Fri, 31 Jan 2025 19:22:55 -0500 Subject: [PATCH 2/3] Ring rework 2 --- src/k_hud.c | 52 +++++++-------------------------------------------- src/p_enemy.c | 3 +-- 2 files changed, 8 insertions(+), 47 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index 036fb8b24..44b147016 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -81,7 +81,6 @@ static patch_t *kp_spbminimap; static patch_t *kp_itemboxminimap; static patch_t *kp_ringsticker[2]; -static patch_t *kp_ringbit[2]; /*static patch_t *kp_ringstickersplit[4]; static patch_t *kp_ring[6]; static patch_t *kp_smallring[6];*/ @@ -268,7 +267,7 @@ void K_LoadKartHUDGraphics(void) // Rings & Lives HU_UpdatePatch(&kp_ringsticker[0], "K_RNGHD"); - HU_UpdatePatch(&kp_ringbit[0], "K_RNGH1"); + HU_UpdatePatch(&kp_ringsticker[1], "K_RNGHL"); /*HU_UpdatePatch(&kp_ringsticker[0], "RNGBACKA"); HU_UpdatePatch(&kp_ringsticker[1], "RNGBACKB"); @@ -2116,8 +2115,6 @@ void K_DrawTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scorelines, IN } } -#define RINGANIM_FLIPFRAME (RINGANIM_NUMFRAMES/2) - static void K_drawKartLapsAndRings(void) { const boolean uselives = G_GametypeUsesLives(); @@ -2141,13 +2138,6 @@ static void K_drawKartLapsAndRings(void) } else if (stplyr->rings >= 20) // Maxed out ringmap = R_GetTranslationColormap(TC_RAINBOW, SKINCOLOR_YELLOW, GTC_CACHE); - - /*if (stplyr->karthud[khud_ringframe] > RINGANIM_FLIPFRAME) - { - ringflip = V_FLIP; - ringanim_realframe = RINGANIM_NUMFRAMES-stplyr->karthud[khud_ringframe]; - ringx += SHORT((r_splitscreen > 1) ? kp_smallring[ringanim_realframe]->width : kp_ring[ringanim_realframe]->width); - }*/ } if (r_splitscreen > 1) @@ -2258,20 +2248,16 @@ static void K_drawKartLapsAndRings(void) if (!ringsdisabled) { SINT8 i; - V_DrawScaledPatch(LAPS_X, LAPS_Y-14, V_HUDTRANS|splitflags, kp_ringsticker[0]); + V_DrawScaledPatch(LAPS_X, LAPS_Y-14, V_HUDTRANS|splitflags, kp_ringsticker[(stplyr->pflags & PF_RINGLOCK) ? 1 : 0]); if (stplyr->rings < 0) // Draw the minus for ring debt { V_DrawMappedPatch(LAPS_X-5, LAPS_Y-11, V_HUDTRANS|splitflags, kp_ringdebtminus, ringmap); - V_DrawMappedPatch(LAPS_X+2, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[0]], ringmap); - V_DrawMappedPatch(LAPS_X+8, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[1]], ringmap); - } - else - { - V_DrawMappedPatch(LAPS_X+2, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[0]], ringmap); - V_DrawMappedPatch(LAPS_X+8, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[1]], ringmap); } + V_DrawMappedPatch(LAPS_X+2, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[0]], ringmap); + V_DrawMappedPatch(LAPS_X+8, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[1]], ringmap); + // Draw the fillbars if (stplyr->rings) { @@ -2298,43 +2284,19 @@ static void K_drawKartLapsAndRings(void) } } } - - /* - // Rings - if (!uselives) - V_DrawScaledPatch(LAPS_X, LAPS_Y-11, V_HUDTRANS|splitflags, kp_ringsticker[1]); - else - V_DrawScaledPatch(LAPS_X, LAPS_Y-11, V_HUDTRANS|splitflags, kp_ringsticker[0]); - - V_DrawMappedPatch(LAPS_X+ringx+7, LAPS_Y-16, V_HUDTRANS|splitflags|ringflip, kp_ring[ringanim_realframe], (colorring ? ringmap : NULL)); - - if (stplyr->rings < 0) // Draw the minus for ring debt - { - V_DrawMappedPatch(LAPS_X+23, LAPS_Y-11, V_HUDTRANS|splitflags, kp_ringdebtminus, ringmap); - V_DrawMappedPatch(LAPS_X+29, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[0]], ringmap); - V_DrawMappedPatch(LAPS_X+35, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[1]], ringmap); - } - else - { - V_DrawMappedPatch(LAPS_X+23, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[0]], ringmap); - V_DrawMappedPatch(LAPS_X+29, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[rn[1]], ringmap); - }*/ - } // Lives if (uselives) { UINT8 *colormap = R_GetTranslationColormap(stplyr->skin, stplyr->skincolor, GTC_CACHE); - V_DrawMappedPatch(LAPS_X+46, LAPS_Y-16, V_HUDTRANS|splitflags, faceprefix[stplyr->skin][FACE_RANK], colormap); + V_DrawMappedPatch(LAPS_X+59, LAPS_Y-16, V_HUDTRANS|splitflags, faceprefix[stplyr->skin][FACE_RANK], colormap); if (stplyr->lives >= 0) - V_DrawScaledPatch(LAPS_X+63, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[(stplyr->lives % 10)]); // make sure this doesn't overflow OR underflow + V_DrawScaledPatch(LAPS_X+77, LAPS_Y-11, V_HUDTRANS|splitflags, kp_facenum[(stplyr->lives % 10)]); // make sure this doesn't overflow OR underflow } } } -#undef RINGANIM_FLIPFRAME - static void K_drawKartAccessibilityIcons(INT32 fx) { INT32 fy = LAPS_Y-25; diff --git a/src/p_enemy.c b/src/p_enemy.c index 01b6f0581..9a594dd31 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -13201,12 +13201,11 @@ void A_SPBChase(mobj_t *actor) if (!ringsdisabled) // Spawn rings to make up for the fact first has ring grabbing { - if (leveltime % 12 == 0) + if (leveltime % 10 == 0) { mobj_t *specialring = P_SpawnMobj(actor->x, actor->y, actor->z, MT_RING); specialring->colorized = true; specialring->color = SKINCOLOR_RED; - P_SetScale(specialring, 3*mapobjectscale/2); specialring->flags |= MF_NOCLIPHEIGHT; } From de1fc65df30cb10c97d35add2ad445bd98a7bf61 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Sat, 1 Feb 2025 10:25:38 -0500 Subject: [PATCH 3/3] Ring rework 3 --- src/k_hud.c | 61 ++++++----------------------------------------------- 1 file changed, 6 insertions(+), 55 deletions(-) diff --git a/src/k_hud.c b/src/k_hud.c index 44b147016..0cfaec82e 100644 --- a/src/k_hud.c +++ b/src/k_hud.c @@ -81,11 +81,9 @@ static patch_t *kp_spbminimap; static patch_t *kp_itemboxminimap; static patch_t *kp_ringsticker[2]; -/*static patch_t *kp_ringstickersplit[4]; -static patch_t *kp_ring[6]; -static patch_t *kp_smallring[6];*/ +static patch_t *kp_ringsplitscreen; static patch_t *kp_ringdebtminus; -//static patch_t *kp_ringdebtminussmall; +static patch_t *kp_ringdebtminussmall; static patch_t *kp_speedometersticker; static patch_t *kp_speedometerlabel[4]; @@ -268,37 +266,9 @@ void K_LoadKartHUDGraphics(void) // Rings & Lives HU_UpdatePatch(&kp_ringsticker[0], "K_RNGHD"); HU_UpdatePatch(&kp_ringsticker[1], "K_RNGHL"); - /*HU_UpdatePatch(&kp_ringsticker[0], "RNGBACKA"); - HU_UpdatePatch(&kp_ringsticker[1], "RNGBACKB"); - - sprintf(buffer, "K_RINGx"); - for (i = 0; i < 6; i++) - { - buffer[6] = '0'+(i+1); - HU_UpdatePatch(&kp_ring[i], "%s", buffer); - } */ - + HU_UpdatePatch(&kp_ringsplitscreen, "K_RNGSS"); HU_UpdatePatch(&kp_ringdebtminus, "K_RNGDM"); - - /*HU_UpdatePatch(&kp_ringstickersplit[0], "SMRNGBGA"); - HU_UpdatePatch(&kp_ringstickersplit[1], "SMRNGBGB"); - - sprintf(buffer, "K_SRINGx"); - for (i = 0; i < 6; i++) - { - buffer[7] = '0'+(i+1); - HU_UpdatePatch(&kp_smallring[i], "%s", buffer); - } - - HU_UpdatePatch(&kp_ringdebtminussmall, "SRDEBTMN"); - - sprintf(buffer, "SPBRGSxx"); - for (i = 0; i < 16; i++) - { - buffer[6] = '0'+((i+1) / 10); - buffer[7] = '0'+((i+1) % 10); - HU_UpdatePatch(&kp_ringspblocksmall[i], "%s", buffer); - }*/ + HU_UpdatePatch(&kp_ringdebtminussmall, "K_RNGSM"); // Speedometer HU_UpdatePatch(&kp_speedometersticker, "K_SPDMBG"); @@ -2171,9 +2141,6 @@ static void K_drawKartLapsAndRings(void) fr = fx; // Laps - /*if (!ringsdisabled) - V_DrawScaledPatch(fx-2 + (flipflag ? (SHORT(kp_ringstickersplit[1]->width) - 3) : 0), fy, V_HUDTRANS|splitflags|flipflag, kp_ringstickersplit[0]);*/ - V_DrawScaledPatch(fx, fy, V_HUDTRANS|splitflags, kp_splitlapflag); V_DrawScaledPatch(fx+22, fy, V_HUDTRANS|splitflags, frameslash); @@ -2200,30 +2167,14 @@ static void K_drawKartLapsAndRings(void) if (!ringsdisabled) { - /* - // Rings - if (!uselives) - { - V_DrawScaledPatch(fx-2 + (flipflag ? (SHORT(kp_ringstickersplit[1]->width) - 3) : 0), fy-10, V_HUDTRANS|splitflags|flipflag, kp_ringstickersplit[1]); - if (flipflag) - fr += 15; - } - else - V_DrawScaledPatch(fx-2 + (flipflag ? (SHORT(kp_ringstickersplit[0]->width) - 3) : 0), fy-10, V_HUDTRANS|splitflags|flipflag, kp_ringstickersplit[0]); - - V_DrawMappedPatch(fr+ringx, fy-13, V_HUDTRANS|splitflags|ringflip, kp_smallring[ringanim_realframe], (colorring ? ringmap : NULL)); + V_DrawMappedPatch(fr, fy-10, V_HUDTRANS|splitflags|ringflip, kp_ringsplitscreen, (colorring ? ringmap : NULL)); if (stplyr->rings < 0) // Draw the minus for ring debt - V_DrawMappedPatch(fr+7, fy-10, V_HUDTRANS|splitflags, kp_ringdebtminussmall, ringmap); + V_DrawMappedPatch(fr+7, fy-8, V_HUDTRANS|splitflags, kp_ringdebtminussmall, ringmap); V_DrawMappedPatch(fr+11, fy-10, V_HUDTRANS|splitflags, fontv[PINGNUM_FONT].font[rn[0]], ringmap); V_DrawMappedPatch(fr+15, fy-10, V_HUDTRANS|splitflags, fontv[PINGNUM_FONT].font[rn[1]], ringmap); - - // SPB ring lock - if (stplyr->pflags & PF_RINGLOCK) - V_DrawScaledPatch(fr-12, fy-23, V_HUDTRANS|splitflags, kp_ringspblocksmall[stplyr->karthud[khud_ringspblock]]); - */ } // Lives