item pickup energy inconsistency

[tigen]

It looks to me (from reading the source) that the energy used for picking up items is different in do_cmd_pickup() versus do_cmd_hold(), or from auto-pickup. The do_cmd_pickup() function has a cap ("maximum time expenditure is a full turn") but the other two places where pickup is called don't appear to have that cap, unless I'm missing something.

I guess this would only affect things if there were >10 items in a pile.

[tigen]

Also, the "do_cmd_hold()" uses base energy (100) PLUS the item pickup energy cost. I think it should just use 100, always. (since cmd_pickup is capped at 100). It's reasonable to assume that the "hold" command should use a full turn, but not more than one turn. Picking up items via this function probably is rare though.

[tigen]

hmm maybe scratch that last one... the cmd_hold function also does searching and a "repeated command".

[takkaria]

r1529