thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 20:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into versus-record

Browse source
This commit is contained in:
TehRealSalt 2019-01-17 01:28:22 -05:00
commit e22c6448fe
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/config.h.in
View file

@ -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"

8
src/k_kart.c
View file

@ -6950,7 +6950,13 @@ static void K_DrawKartPositionNum(INT32 num)
W = FixedMul(W<<FRACBITS, scale)>>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.