Merge branch 'droptweaks' into 'master'
Droptweaks See merge request KartKrew/Kart!27
This commit is contained in:
commit
da4853f4d5
|
@ -3157,7 +3157,7 @@ void K_DropHnextList(player_t *player)
|
||||||
mobj_t *work = player->mo, *nextwork, *dropwork;
|
mobj_t *work = player->mo, *nextwork, *dropwork;
|
||||||
INT32 flip;
|
INT32 flip;
|
||||||
mobjtype_t type;
|
mobjtype_t type;
|
||||||
boolean orbit, ponground;
|
boolean orbit, ponground, dropall = true;
|
||||||
|
|
||||||
if (!work)
|
if (!work)
|
||||||
return;
|
return;
|
||||||
|
@ -3197,6 +3197,7 @@ void K_DropHnextList(player_t *player)
|
||||||
break;
|
break;
|
||||||
case MT_SSMINE_SHIELD:
|
case MT_SSMINE_SHIELD:
|
||||||
orbit = false;
|
orbit = false;
|
||||||
|
dropall = false;
|
||||||
type = MT_SSMINE;
|
type = MT_SSMINE;
|
||||||
break;
|
break;
|
||||||
case MT_FAKESHIELD:
|
case MT_FAKESHIELD:
|
||||||
|
@ -3275,7 +3276,8 @@ void K_DropHnextList(player_t *player)
|
||||||
player->kartstuff[k_bananadrag] = 0;
|
player->kartstuff[k_bananadrag] = 0;
|
||||||
if (player->kartstuff[k_eggmanheld])
|
if (player->kartstuff[k_eggmanheld])
|
||||||
player->kartstuff[k_eggmanheld] = 0;
|
player->kartstuff[k_eggmanheld] = 0;
|
||||||
else if (player->kartstuff[k_itemheld])
|
else if (player->kartstuff[k_itemheld]
|
||||||
|
&& (dropall || (--player->kartstuff[k_itemamount] <= 0)))
|
||||||
{
|
{
|
||||||
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
|
player->kartstuff[k_itemamount] = player->kartstuff[k_itemheld] = 0;
|
||||||
player->kartstuff[k_itemtype] = KITEM_NONE;
|
player->kartstuff[k_itemtype] = KITEM_NONE;
|
||||||
|
|
Loading…
Reference in a new issue