From 409f698331d26fe3d876d3c4e11669c890f8dc3a Mon Sep 17 00:00:00 2001 From: wolfy852 Date: Wed, 16 Jan 2019 19:53:09 -0600 Subject: [PATCH 1/2] Fix position numbers being off in 1P --- src/k_kart.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/k_kart.c b/src/k_kart.c index 476bff462..3ac84453b 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -6841,7 +6841,13 @@ static void K_DrawKartPositionNum(INT32 num) W = FixedMul(W<>FRACBITS; // pain and suffering defined below - if (splitscreen == 1) // for this splitscreen, we'll use case by case because it's a bit different. + if (!splitscreen) + { + fx = POSI_X; + fy = BASEVIDHEIGHT - 8; + fflags = V_SNAPTOBOTTOM|V_SNAPTORIGHT; + } + else if (splitscreen == 1) // for this splitscreen, we'll use case by case because it's a bit different. { fx = POSI_X; if (stplyr == &players[displayplayer]) // for player 1: display this at the top right, above the minimap. From 79557b2b763bb2e1e59f1a2749c987076a6dd16c Mon Sep 17 00:00:00 2001 From: wolfy852 Date: Wed, 16 Jan 2019 20:02:40 -0600 Subject: [PATCH 2/2] Update chars.kart hash --- src/config.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.h.in b/src/config.h.in index 78d14d5bb..d28d55db0 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -36,7 +36,7 @@ /* Manually defined asset hashes for non-CMake builds * Last updated 2015 / 05 / 03 - SRB2 v2.1.15 - srb2.srb * Last updated 2018 / 12 / 23 - SRB2 v2.1.22 - patch.dta - * Last updated 2019 / 01 / 15 - Kart v1.0.2 - Main assets + * Last updated 2019 / 01 / 16 - Kart v1.0.2 - Main assets * Last updated 2019 / 01 / 15 - Kart v1.0.2 - patch.kart */ @@ -49,7 +49,7 @@ // SRB2Kart-specific hashes #define ASSET_HASH_GFX_KART "99c39f223d84ebc78e67ab68f3bead95" #define ASSET_HASH_TEXTURES_KART "ec8e9b7535cf585afe72ef277b08f490" -#define ASSET_HASH_CHARS_KART "784ee9177b01c8cb26edff43eaf93d87" +#define ASSET_HASH_CHARS_KART "a83ccd0fa172b1c01216560633bd0d6b" #define ASSET_HASH_MAPS_KART "1335cd064656aedca359cfbb5233ac4a" #ifdef USE_PATCH_KART #define ASSET_HASH_PATCH_KART "899aee1b63e731b7e2098406c85608b4"