W_PreviousWeapon(1);
break;
case 20:
- if(!forbidWeaponUse(self)) { WEP_ACTION(self.weapon, WR_RELOAD); }
+ if(!forbidWeaponUse(self)) {
+ Weapon w = get_weaponinfo(self.weapon);
+ w.wr_reload(w);
+ }
break;
}
}
else
self.impulse = imp; // retry in next frame
}
- else if(imp >= 230 && imp <= 253)
+ else if(imp >= WEP_IMPULSE_BEGIN && imp <= WEP_IMPULSE_END)
{
if(!self.vehicle)
if(self.deadflag == DEAD_NO)
- W_SwitchWeapon (imp - 230 + WEP_FIRST);
+ W_SwitchWeapon (imp - WEP_IMPULSE_BEGIN + WEP_FIRST);
else
self.impulse = imp; // retry in next frame
}