stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-23 17:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'thundertweak' into 'master'

Browse source 
Thundertweak

See merge request KartKrew/Kart!49
This commit is contained in:
Sal 2018-10-19 15:50:47 -04:00
commit 22aa01b35e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_kart.c
View file

@ -5005,11 +5005,12 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
} }
break; break;
case KITEM_THUNDERSHIELD: case KITEM_THUNDERSHIELD:
if (player->kartstuff[k_curshield] <= 0) if (player->kartstuff[k_curshield] != 1)
{ {
mobj_t *shield = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THUNDERSHIELD); mobj_t *shield = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_THUNDERSHIELD);
P_SetScale(shield, (shield->destscale = (5*shield->destscale)>>2)); P_SetScale(shield, (shield->destscale = (5*shield->destscale)>>2));
P_SetTarget(&shield->target, player->mo); P_SetTarget(&shield->target, player->mo);
S_StartSound(shield, sfx_s3k41);
player->kartstuff[k_curshield] = 1; player->kartstuff[k_curshield] = 1;
} }
if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO) if (ATTACK_IS_DOWN && !HOLDING_ITEM && NO_HYUDORO)