shop theft/breakage (trunk only)

The recent fix for "breaking glass wand in tool shop" looked suspect,
adding a call to costly_alteration after an existing call to stolen_value.
Either one or the other ought to suffice.  (For items on the floor,
costly_alteration() calls stolen_value(); for items in inventory, or just
released from inventory and not placed on floor yet, costly_alteration()
adds a usage fee to the shop bill but doesn't annoy the shopkeeper into
adding surcharges to prices or summoning the kops if already hostile.)

     In 3.4.3, stolen_value() wasn't smart enough to charge for an out-of-
shk's-field item (like a wand in a tool shop) taken from a shop container,
and that's the problem the user was reporting.  But the post-3.4.3 code was
changed to handle that by checking billable() instead of saleable(); this
bug should have been gone.  Unfortunately, billable() treats items already
on the bill as not interesting--from the perspective of adding things to
the bill--so the change accidentally resulted in stolen_value() no longer
handling objects which are marked unpaid, triggering the same symptom for
a different reason.  (Other events besides the breakage of thrown objects
suffered from the bug's new incarnation since various places deliberately
call stolen_value() for unpaid objects.)  This updates stolen_value() and
stolen_container() to account for the behavior of billable().  And a few
calls to subfrombill() go away since stolen_value() now takes care of that.

src/dokick.c

@@ -1,4 +1,4 @@
-/*	SCCS Id: @(#)dokick.c	3.5	2005/12/02	*/
+/*	SCCS Id: @(#)dokick.c	3.5	2006/06/21	*/
 /* Copyright (c) Izchak Miller, Mike Stephenson, Steve Linhart, 1989. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1337,7 +1337,6 @@ boolean shop_floor_obj;
 
 	if(unpaid || shop_floor_obj) {
 	    if(unpaid) {
-		subfrombill(otmp, shop_keeper(*u.ushops));
 		(void)stolen_value(otmp, u.ux, u.uy, TRUE, FALSE);
 	    } else {
 		ox = otmp->ox;