… | |
… | |
934 | op->failmsg ("Only dropped some items, can't drop that many items at once."); |
934 | op->failmsg ("Only dropped some items, can't drop that many items at once."); |
935 | } |
935 | } |
936 | else |
936 | else |
937 | drop_object (pl, op, nrof); |
937 | drop_object (pl, op, nrof); |
938 | |
938 | |
939 | update_after_inventory_change (pl); |
|
|
940 | |
|
|
941 | return; |
939 | return; |
942 | } |
940 | } |
943 | else if (to == pl->count) |
941 | else if (to == pl->count) |
944 | { /* pick it up to the inventory */ |
942 | { /* pick it up to the inventory */ |
945 | /* return if player has already picked it up */ |
943 | /* return if player has already picked it up */ |
… | |
… | |
961 | /* put_object_in_sack presumes that necessary sanity checking |
959 | /* put_object_in_sack presumes that necessary sanity checking |
962 | * has already been done (eg, it can be picked up and fits in |
960 | * has already been done (eg, it can be picked up and fits in |
963 | * in a sack, so check for those things. We should also check |
961 | * in a sack, so check for those things. We should also check |
964 | * an make sure env is in fact a container for that matter. |
962 | * an make sure env is in fact a container for that matter. |
965 | */ |
963 | */ |
966 | if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) |
964 | if (env->type == CONTAINER |
967 | { |
965 | && can_pick (pl, op) |
|
|
966 | && sack_can_hold (pl, env, op, nrof)) |
968 | put_object_in_sack (pl, env, op, nrof); |
967 | put_object_in_sack (pl, env, op, nrof); |
969 | update_after_inventory_change (pl); |
|
|
970 | } |
|
|
971 | } |
968 | } |
972 | |
969 | |