incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New map patches, fix wrong name for SPB result

Browse source
This commit is contained in:
GenericHeroGuy 2025-12-25 23:32:24 +01:00
parent fdd5c2b3ed
commit a5b82f41cb
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_main.cpp
View file

@ -93,8 +93,8 @@
#define ASSET_HASH_TEXTURES_KART 0xb4211b2f32b6a291
#define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b
#define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9
#define ASSET_HASH_MAIN_PK3 0x0bb244e3e53dc163
#define ASSET_HASH_MAPPATCH_PK3 0x6ad99efcfaafb70f
#define ASSET_HASH_MAIN_PK3 0xacccb2c74bdc8d68
#define ASSET_HASH_MAPPATCH_PK3 0x8b6a87089bb6bea4
#define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461
#ifdef USE_PATCH_FILE
#define ASSET_HASH_PATCH_PK3 0x0000000000000000

8
src/k_items.c
View file

@ -1428,10 +1428,10 @@ void K_KartItemRoulette(player_t *player, ticcmd_t *cmd)
// SPECIAL CASE No. 6:
// In battle, an SPB is forced onto players to target the "most wanted" player
if (K_BattleForceSPB(player)
&& spbplace == -1 && K_GetKartResult("spb")->cooldown == 0 && !dontforcespb
&& K_ItemResultEnabled(K_GetKartResult("spb")))
&& spbplace == -1 && K_GetKartResult("selfpropelledbomb")->cooldown == 0 && !dontforcespb
&& K_ItemResultEnabled(K_GetKartResult("selfpropelledbomb")))
{
K_AwardPlayerResult(player, K_GetKartResult("spb"), KITEMBLINK_KARMA);
K_AwardPlayerResult(player, K_GetKartResult("selfpropelledbomb"), KITEMBLINK_KARMA);
return;
}
@ -1556,7 +1556,7 @@ INT32 KO_SPBRaceOdds(INT32 odds, const kartroulette_t *roulette, const kartresul
*forceme = 0;
}
else if (K_RaceForceSPB(roulette->playerpos, roulette->pdis)
&& spbplace == -1 && K_GetKartResult("spb")->cooldown == 0)
&& spbplace == -1 && K_GetKartResult("selfpropelledbomb")->cooldown == 0)
{
// Force SPB onto 2nd if they get too far behind.
*forceme = 2;