thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'implementDebugItemAmount' into 'master'

Browse source 
Implement debugitemamount

See merge request KartKrew/RingRacers!4
This commit is contained in:
Eidolon 2024-05-01 22:50:24 +00:00
commit 0f0683633a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_hud.cpp
View file

@ -1401,7 +1401,8 @@ static void K_drawKartItem(void)
const SINT8 result = stplyr->itemRoulette.itemList[index]; const SINT8 result = stplyr->itemRoulette.itemList[index];
const SINT8 item = K_ItemResultToType(result); const SINT8 item = K_ItemResultToType(result);
const UINT8 amt = K_ItemResultToAmount(result); const boolean usingDebugItemAmount = cv_kartdebugitem.value != KITEM_NONE && cv_kartdebugitem.value == item && cv_kartdebugamount.value > 1;
const UINT8 amt = usingDebugItemAmount ? cv_kartdebugamount.value : K_ItemResultToAmount(result);
switch (item) switch (item)
{ {

5
src/k_roulette.c
View file

@ -1576,7 +1576,10 @@ static void K_KartGetItemResult(player_t *const player, kartitems_t getitem)
player->botvars.itemconfirm = 0; player->botvars.itemconfirm = 0;
player->itemtype = K_ItemResultToType(getitem); player->itemtype = K_ItemResultToType(getitem);
player->itemamount = K_ItemResultToAmount(getitem); UINT8 itemamount = K_ItemResultToAmount(getitem);
if (cv_kartdebugitem.value != KITEM_NONE && cv_kartdebugitem.value == player->itemtype && cv_kartdebugamount.value > 1)
itemamount = cv_kartdebugamount.value;
player->itemamount = itemamount;
if (player->itemtype == KITEM_SPB) if (player->itemtype == KITEM_SPB)
Obj_SPBEradicateCapsules(); Obj_SPBEradicateCapsules();