Skip to content

Commit 590a026

Browse files
committed
swars: Do not auto-consume demikit when selected
1 parent 98f5f4e commit 590a026

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/people.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3732,7 +3732,8 @@ ubyte thing_select_specific_weapon(struct Thing *p_person, WeaponType wtype, uby
37323732
if (!person_carries_weapon(p_person, wtype))
37333733
return WepSel_SKIP;
37343734

3735-
if (wtype == WEP_MEDI1) // TODO why selecting medkit just uses it? Make it active innstead, and use on LMB? Why make MEDI2 different?
3735+
#if 0 // Disabled by community consensus - medikit should not be auto-consumed when selected
3736+
if (wtype == WEP_MEDI1)
37363737
{
37373738
if ((p_person->Flag & TngF_PlayerAgent) != 0) {
37383739
PlayerIdx plyr;
@@ -3746,6 +3747,7 @@ ubyte thing_select_specific_weapon(struct Thing *p_person, WeaponType wtype, uby
37463747
person_weapons_remove_one(p_person, wtype);
37473748
return WepSel_HIDE;
37483749
}
3750+
#endif
37493751

37503752
if (((p_person->U.UPerson.CurrentWeapon == wtype) || (flag == WepSel_HIDE)) && (flag != WepSel_SELECT))
37513753
{

0 commit comments

Comments
 (0)