thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 19:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'landmine-scale' into 'master'

Browse source 
Consistent landmine scaling

Closes ring-racers#413

See merge request kart-krew-dev/ring-racers-internal!2992
This commit is contained in:
Gunla 2025-11-01 21:44:31 +00:00
commit 108e10f76a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_kart.c
View file

@ -8225,8 +8225,8 @@ static void K_ThrowLandMine(player_t *player)
P_SetTarget(&landMine->target, player->mo); P_SetTarget(&landMine->target, player->mo);
P_SetScale(landMine, player->mo->scale); P_SetScale(landMine, (landMine->destscale = K_ItemScaleForPlayer(player)));
landMine->destscale = player->mo->destscale; //CONS_Printf("landMine->scale is %f, player scale is %f\n", ((double)landMine->destscale)/mapobjectscale, ((double)player->mo->destscale)/mapobjectscale);
landMine->angle = player->mo->angle; landMine->angle = player->mo->angle;
@ -15644,6 +15644,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)
{ {
K_AdjustPlayerItemAmount(player, -1); K_AdjustPlayerItemAmount(player, -1);
K_SetItemOut(player); // need this to set itemscale
if (player->throwdir > 0) if (player->throwdir > 0)
{ {
K_ThrowKartItem(player, true, MT_LANDMINE, -1, 0, 0); K_ThrowKartItem(player, true, MT_LANDMINE, -1, 0, 0);
@ -15652,6 +15653,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
{ {
K_ThrowLandMine(player); K_ThrowLandMine(player);
} }
K_UnsetItemOut(player);
K_PlayAttackTaunt(player->mo); K_PlayAttackTaunt(player->mo);
player->botvars.itemconfirm = 0; player->botvars.itemconfirm = 0;
} }