pull in the recent unconditionals merge from master

src/pickup.c

@@ -1,4 +1,5 @@
-/* NetHack 3.5	pickup.c	$Date$  $Revision$ */
+/* NetHack 3.5	pickup.c	$NHDT-Date: 1425081977 2015/02/28 00:06:17 $  $NHDT-Branch: (no branch, rebasing scshunt-unconditionals) $:$NHDT-Revision: 1.126 $ */
+/* NetHack 3.5	pickup.c	$Date: 2012/02/16 03:01:38 $  $Revision: 1.123 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -11,13 +12,8 @@
 #define CONTAINED_SYM	'>'	/* from invent.c */
 
 STATIC_DCL void FDECL(simple_look, (struct obj *,BOOLEAN_P));
-#ifndef GOLDOBJ
-STATIC_DCL boolean FDECL(query_classes, (char *,boolean *,boolean *,
-		const char *,struct obj *,BOOLEAN_P,BOOLEAN_P,int *));
-#else
 STATIC_DCL boolean FDECL(query_classes, (char *,boolean *,boolean *,
 		const char *,struct obj *,BOOLEAN_P,int *));
-#endif
 STATIC_DCL boolean FDECL(fatal_corpse_mistake, (struct obj *,BOOLEAN_P));
 STATIC_DCL void FDECL(check_here, (BOOLEAN_P));
 STATIC_DCL boolean FDECL(n_or_more, (struct obj *));
@@ -100,15 +96,6 @@ boolean here;		/* flag for type of obj list linkage */
 	}
 }
 
-#ifndef GOLDOBJ
-int
-collect_obj_classes(ilets, otmp, here, incl_gold, filter, itemcount)
-char ilets[];
-register struct obj *otmp;
-boolean here, incl_gold;
-boolean FDECL((*filter),(OBJ_P));
-int *itemcount;
-#else
 int
 collect_obj_classes(ilets, otmp, here, filter, itemcount)
 char ilets[];
@@ -116,16 +103,11 @@ register struct obj *otmp;
 boolean here;
 boolean FDECL((*filter),(OBJ_P));
 int *itemcount;
-#endif
 {
 	register int iletct = 0;
 	register char c;
 
 	*itemcount = 0;
-#ifndef GOLDOBJ
-	if (incl_gold)
-	    ilets[iletct++] = def_oc_syms[COIN_CLASS].sym;
-#endif
 	ilets[iletct] = '\0'; /* terminate ilets so that index() will work */
 	while (otmp) {
 	    c = def_oc_syms[(int)otmp->oclass].sym;
@@ -150,17 +132,6 @@ int *itemcount;
  *	"?/a" or "a?/" or "/a?",&c picks all '?' even though no '/'
  *	    (ie, treated as if it had just been "?a").
  */
-#ifndef GOLDOBJ
-STATIC_OVL boolean
-query_classes(oclasses, one_at_a_time, everything, action, objs,
-	      here, incl_gold, menu_on_demand)
-char oclasses[];
-boolean *one_at_a_time, *everything;
-const char *action;
-struct obj *objs;
-boolean here, incl_gold;
-int *menu_on_demand;
-#else
 STATIC_OVL boolean
 query_classes(oclasses, one_at_a_time, everything, action, objs,
 	      here, menu_on_demand)
@@ -170,7 +141,6 @@ const char *action;
 struct obj *objs;
 boolean here;
 int *menu_on_demand;
-#endif
 {
 	char ilets[20], inbuf[BUFSZ];
 	int iletct, oclassct;
@@ -182,9 +152,6 @@ int *menu_on_demand;
 	oclasses[oclassct = 0] = '\0';
 	*one_at_a_time = *everything = m_seen = FALSE;
 	iletct = collect_obj_classes(ilets, objs, here,
-#ifndef GOLDOBJ
-				     incl_gold,
-#endif
 				     (boolean FDECL((*),(OBJ_P))) 0, &itemcount);
 	if (iletct == 0) {
 		return FALSE;
@@ -577,9 +544,6 @@ menu_pickup:
 		if (!query_classes(oclasses, &selective, &all_of_a_type,
 				   "pick up", objchain,
 				   traverse_how == BY_NEXTHERE,
-#ifndef GOLDOBJ
-				   FALSE,
-#endif
 				   &via_menu)) {
 		    if (!via_menu) return (0);
 		    n = query_objlist("Pick up what?",
@@ -648,7 +612,6 @@ end_query:
 	return (n_tried > 0);
 }
 
-#ifdef AUTOPICKUP_EXCEPTIONS
 boolean
 is_autopickup_exception(obj, grab)
 struct obj *obj;
@@ -667,7 +630,6 @@ boolean grab;	 /* forced pickup, rather than forced leave behind? */
 	}
 	return FALSE;
 }
-#endif /* AUTOPICKUP_EXCEPTIONS */
 
 /*
  * Pick from the given list using flags.pickup_types.  Return the number
@@ -691,12 +653,10 @@ menu_item **pick_list;	/* list of objects and counts to pick up */
 	/* first count the number of eligible items */
 	for (n = 0, curr = olist; curr; curr = FOLLOW(curr, follow)) {
 	    pickit = (!*otypes || index(otypes, curr->oclass));
-#ifdef AUTOPICKUP_EXCEPTIONS
 	    /* check for "always pick up */
 	    if (!pickit) pickit = is_autopickup_exception(curr, TRUE);
 	    /* then for "never pick up */
 	    if (pickit) pickit = !is_autopickup_exception(curr, FALSE);
-#endif
 	    /* pickup_thrown overrides pickup_types and exceptions */
 	    if (!pickit) pickit = (flags.pickup_thrown && curr->was_thrown);
 	    /* finally, do we count this object? */
@@ -707,10 +667,8 @@ menu_item **pick_list;	/* list of objects and counts to pick up */
 	    *pick_list = pi = (menu_item *) alloc(sizeof(menu_item) * n);
 	    for (n = 0, curr = olist; curr; curr = FOLLOW(curr, follow)) {
 		pickit = (!*otypes || index(otypes, curr->oclass));
-#ifdef AUTOPICKUP_EXCEPTIONS
 		if (!pickit) pickit = is_autopickup_exception(curr, TRUE);
 		if (pickit) pickit = !is_autopickup_exception(curr, FALSE);
-#endif
 		if (!pickit) pickit = (flags.pickup_thrown && curr->was_thrown);
 		if (pickit) {
 		    pi[n].item.a_obj = curr;
@@ -939,9 +897,7 @@ int how;			/* type of query */
 		(*pick_list)->item.a_int = curr->oclass;
 		return 1;
 	    } else {
-#ifdef DEBUG
-		impossible("query_category: no single object match");
-#endif
+		debugpline("query_category: no single object match");
 	    }
 	    return 0;
 	}
@@ -1095,11 +1051,7 @@ int *wt_before, *wt_after;
 
     savequan = obj->quan;
     saveowt = obj->owt;
-#ifndef GOLDOBJ
-    umoney = u.ugold;
-#else
     umoney = money_cnt(invent);
-#endif
     iw = max_capacity();
 
     if (count != savequan) {
@@ -1314,62 +1266,12 @@ boolean telekinesis;	/* not picking it up directly by hand */
 	/* In case of auto-pickup, where we haven't had a chance
 	   to look at it yet; affects docall(SCR_SCARE_MONSTER). */
 	if (!Blind)
-#ifdef INVISIBLE_OBJECTS
-		if (!obj->oinvis || See_invisible)
-#endif
 		obj->dknown = 1;
 
 	if (obj == uchain) {    /* do not pick up attached chain */
 	    return 0;
 	} else if (obj->oartifact && !touch_artifact(obj,&youmonst)) {
 	    return 0;
-#ifndef GOLDOBJ
-	} else if (obj->oclass == COIN_CLASS) {
-	    /* Special consideration for gold pieces... */
-	    long iw = (long)max_capacity() - GOLD_WT(u.ugold);
-	    long gold_capacity = GOLD_CAPACITY(iw, u.ugold);
-	    const char *where = (obj->ox == u.ux && obj->oy == u.uy) ?
-				"here" : "there";
-
-	    if (gold_capacity <= 0L) {
-		pline(
-	       "There %s %ld gold piece%s %s, but you cannot carry any more.",
-		      otense(obj, "are"),
-		      obj->quan, plur(obj->quan), where);
-		return 0;
-	    } else if (gold_capacity < count) {
-		You("can only %s %s of the %ld gold pieces lying %s.",
-		    telekinesis ? "acquire" : "carry",
-		    gold_capacity == 1L ? "one" : "some", obj->quan, where);
-		pline("%s %ld gold piece%s.",
-		    nearloadmsg, gold_capacity, plur(gold_capacity));
-		u.ugold += gold_capacity;
-		obj->quan -= gold_capacity;
-		costly_gold(obj->ox, obj->oy, gold_capacity);
-	    } else {
-		u.ugold += count;
-		if (count == obj->quan)
-		    /* costly_gold() can trigger --More-- prompt, so
-		       take gold off map before messages in order to
-		       prevent hangup save there from duplicating it */
-		    obj_extract_self(obj);	/* remove from floor */
-		else
-		    obj->quan -= count;
-		if ((nearload = near_capacity()) != 0)
-		    pline("%s %ld gold piece%s.",
-			  nearload < MOD_ENCUMBER ?
-			  moderateloadmsg : nearloadmsg,
-			  count, plur(count));
-		else
-		    prinv((char *) 0, obj, count);
-		costly_gold(obj->ox, obj->oy, count);
-		if (obj->where == OBJ_FREE)
-		    delobj(obj);
-	    }
-	    context.botl = 1;
-	    if (context.run) nomul(0);
-	    return 1;
-#endif
 	} else if (obj->otyp == CORPSE) {
 	    if (fatal_corpse_mistake(obj, telekinesis) ||
 		    rider_corpse_revival(obj, telekinesis))
@@ -1394,10 +1296,8 @@ boolean telekinesis;	/* not picking it up directly by hand */
 	if ((res = lift_object(obj, (struct obj *)0, &count, telekinesis)) <= 0)
 	    return res;
 
-#ifdef GOLDOBJ
         /* Whats left of the special case for gold :-) */
 	if (obj->oclass == COIN_CLASS) context.botl = 1;
-#endif
 	if (obj->quan != count && obj->otyp != LOADSTONE)
 	    obj = splitobj(obj, count);
 
@@ -1416,8 +1316,6 @@ boolean telekinesis;	/* not picking it up directly by hand */
  * and putting it in the hero's inventory.  Take care of billing.  Return a
  * pointer to the object where otmp ends up.  This may be different
  * from otmp because of merging.
- *
- * Gold never reaches this routine unless GOLDOBJ is defined.
  */
 struct obj *
 pick_obj(otmp)
@@ -1515,11 +1413,9 @@ boolean looting;	/* loot vs tip */
 	const char *verb = looting ? "loot" : "tip";
 
 	if (!can_reach_floor(TRUE)) {
-#ifdef STEED
 		if (u.usteed && P_SKILL(P_RIDING) < P_BASIC)
 			rider_cant_reach(); /* not skilled enough to reach */
 		else
-#endif
 			cant_reach_floor(x, y, FALSE, TRUE);
 		return FALSE;
 	} else if ((is_pool(x, y) && (looting || !Underwater)) ||
@@ -1704,12 +1600,6 @@ reverse_loot()
 	return FALSE;
     }
 
-#ifndef GOLDOBJ
-    if (u.ugold) {
-	contribution = ((long)rnd(5) * u.ugold + 4L) / 5L;
-	goldob = mkgoldobj(contribution);
-    }
-#else
     /* find a money object to mess with */
     for (goldob = invent; goldob; goldob = goldob->nobj)
 	if (goldob->oclass == COIN_CLASS) {
@@ -1718,7 +1608,6 @@ reverse_loot()
 		goldob = splitobj(goldob, contribution);
 	    break;
 	}
-#endif
     if (!goldob) return FALSE;
 
     if (!IS_THRONE(levl[x][y].typ)) {
@@ -1739,9 +1628,7 @@ reverse_loot()
 
 	if (coffers) {
 	    verbalize("Thank you for your contribution to reduce the debt.");
-#ifdef GOLDOBJ
 	    freeinv(goldob);
-#endif
 	    (void)add_to_container(coffers, goldob);
 	    coffers->owt = weight(coffers);
 	    coffers->cknown = 0;
@@ -1750,13 +1637,8 @@ reverse_loot()
 		(void)boxlock(coffers, &boxdummy);
 	    }
 	} else if ((mon = makemon(courtmon(), x, y, NO_MM_FLAGS)) != 0) {
-#ifndef GOLDOBJ
-	    mon->mgold += goldob->quan;
-	    delobj(goldob);
-#else
 	    freeinv(goldob);
 	    add_to_minv(mon, goldob);
-#endif
 	    pline("The exchequer accepts your contribution.");
 	} else {
 	    You("drop %s.", doname(goldob));
@@ -1776,7 +1658,6 @@ boolean *prev_loot;
 {
     int c = -1;
     int timepassed = 0;
-#ifdef STEED
     struct obj *otmp;
     char qbuf[QBUFSZ];
 
@@ -1815,7 +1696,6 @@ boolean *prev_loot;
 		return (0);
 	}
     }
-#endif	/* STEED */
     /* 3.4.0 introduced the ability to pick things up from within swallower's stomach */
     if (u.uswallow) {
 	int count = passed_info ? *passed_info : 0;
@@ -2051,9 +1931,6 @@ register struct obj *obj;
 	      otmp, count);
 
 	if (is_gold) {
-#ifndef GOLDOBJ
-		dealloc_obj(obj);
-#endif
 		bot();	/* update character's gold piece count immediately */
 	}
 	return 1;
@@ -2170,9 +2047,6 @@ struct obj **objp;
 int held;
 {
 	struct obj *curr, *otmp, *obj = *objp;
-#ifndef GOLDOBJ
-	struct obj *u_gold = (struct obj *)0;
-#endif
 	boolean quantum_cat, cursed_mbag,
 		loot_out, loot_in, loot_in_first, stash_one,
 		inokay, outokay, outmaybe;
@@ -2236,9 +2110,6 @@ int held;
 	}
 	inokay = (invent != 0 &&
 		  !(invent == current_container && !current_container->nobj));
-#ifndef GOLDOBJ
-	if (u.ugold) inokay = TRUE;
-#endif
 	outokay = Has_contents(current_container);
 	if (!outokay)	/* preformat the empty-container message */
 	    Sprintf(emptymsg, "%s is %sempty.",
@@ -2333,11 +2204,6 @@ int held;
 	    }
 	}
 
-#ifndef GOLDOBJ
-	/* if putting in, place gold where inventory traversal will see it */
-	if ((loot_in || stash_one) && u.ugold)
-	    u_gold = insert_gold_into_invent(TRUE);
-#endif
 	if ((loot_in || stash_one) &&
 		(!invent || (invent == current_container && !invent->nobj))) {
 	    You("don't have anything%s to %s.",
@@ -2373,11 +2239,6 @@ int held;
 	/* putting something in might have triggered magic bag explosion */
 	if (!current_container) loot_out = FALSE;
 
-#ifndef GOLDOBJ
-	/* if we put gold into inventory above, take it back out now */
-	if (u_gold) remove_gold_from_invent();
-#endif
-
 	/* out after in */
 	if (loot_out && loot_in_first) {
 	    if (!Has_contents(current_container)) {
@@ -2435,9 +2296,6 @@ boolean put_in;
 
     if (query_classes(selection, &one_by_one, &allflag,
 		      action, *objlist, FALSE,
-#ifndef GOLDOBJ
-		      put_in ? (boolean)(u.ugold != 0L) : FALSE,
-#endif
 		      &menu_on_request)) {
 	    if (askchain(objlist, (one_by_one ? (char *)0 : selection),
 			 allflag, actionfunc, checkfunc, 0, action))