Remove vestiges of old overlay source split

[trunk only]

src/invent.c

@@ -7,30 +7,24 @@
 #define NOINVSYM	'#'
 #define CONTAINED_SYM	'>'	/* designator for inside a container */
 
-#ifdef OVL1
 STATIC_DCL void NDECL(reorder_invent);
 STATIC_DCL boolean FDECL(mergable,(struct obj *,struct obj *));
 STATIC_DCL void FDECL(invdisp_nothing, (const char *,const char *));
 STATIC_DCL boolean FDECL(worn_wield_only, (struct obj *));
 STATIC_DCL boolean FDECL(only_here, (struct obj *));
-#endif /* OVL1 */
 STATIC_DCL void FDECL(compactify,(char *));
 STATIC_DCL boolean FDECL(taking_off, (const char *));
 STATIC_DCL boolean FDECL(putting_on, (const char *));
 STATIC_PTR int FDECL(ckunpaid,(struct obj *));
 STATIC_PTR int FDECL(ckvalidcat,(struct obj *));
 static char FDECL(display_pickinv, (const char *,BOOLEAN_P, long *));
-#ifdef OVLB
 STATIC_DCL boolean FDECL(this_type_only, (struct obj *));
 STATIC_DCL void NDECL(dounpaid);
 STATIC_DCL struct obj *FDECL(find_unpaid,(struct obj *,struct obj **));
 STATIC_DCL void FDECL(menu_identify, (int));
 STATIC_DCL boolean FDECL(tool_in_use, (struct obj *));
-#endif /* OVLB */
 STATIC_DCL char FDECL(obj_to_let,(struct obj *));
 
-#ifdef OVLB
-
 static int lastinvnr = 51;	/* 0 ... 51 (never saved&restored) */
 
 #ifdef WIZARD
@@ -79,9 +73,6 @@ register struct obj *otmp;
 	lastinvnr = i;
 }
 
-#endif /* OVLB */
-#ifdef OVL1
-
 /* note: assumes ASCII; toggling a bit puts lowercase in front of uppercase */
 #define inv_rank(o) ((o)->invlet ^ 040)
 
@@ -360,9 +351,6 @@ struct obj *obj;
 	}
 }
 
-#endif /* OVL1 */
-#ifdef OVLB
-
 /* Add an item to the inventory unless we're fumbling or it refuses to be
  * held (via touch_artifact), and give a message.
  * If there aren't any free inventory slots, we'll drop it instead.
@@ -475,9 +463,6 @@ boolean maybe_unpaid;	/* false if caller handles shop billing */
 	if (obj->known) update_inventory();
 }
 
-#endif /* OVLB */
-#ifdef OVL3
-
 /*
 Adjust hero's attributes as if this object was being removed from the
 hero's inventory.  This should only be called from freeinv() and
@@ -554,9 +539,6 @@ int x, y;
 	}
 }
 
-#endif /* OVL3 */
-#ifdef OVL2
-
 /* destroy object in fobj chain (if unpaid, it remains on the bill) */
 void
 delobj(obj)
@@ -581,9 +563,6 @@ register struct obj *obj;
 	obfree(obj, (struct obj *) 0);	/* frees contents also */
 }
 
-#endif /* OVL2 */
-#ifdef OVL0
-
 struct obj *
 sobj_at(n,x,y)
 register int n, x, y;
@@ -596,9 +575,6 @@ register int n, x, y;
 	return((struct obj *)0);
 }
 
-#endif /* OVL0 */
-#ifdef OVLB
-
 struct obj *
 carrying(type)
 register int type;
@@ -658,9 +634,6 @@ int x, y;
 	return(FALSE);
 }
 
-#endif /* OVLB */
-#ifdef OVL2
-
 struct obj *
 g_at(x,y)
 register int x, y;
@@ -673,8 +646,6 @@ register int x, y;
 	return((struct obj *)0);
 }
 
-#endif /* OVL2 */
-#ifdef OVLB
 #ifndef GOLDOBJ
 /* Make a gold object from the hero's gold. */
 struct obj *
@@ -691,8 +662,6 @@ register long q;
 	return(otmp);
 }
 #endif
-#endif /* OVLB */
-#ifdef OVL1
 
 STATIC_OVL void
 compactify(buf)
@@ -1125,9 +1094,6 @@ struct obj *otmp;
 	}
 }
 
-#endif /* OVL1 */
-#ifdef OVLB
-
 STATIC_PTR int
 ckvalidcat(otmp)
 register struct obj *otmp;
@@ -1553,9 +1519,6 @@ int id_limit;
     update_inventory();
 }
 
-#endif /* OVLB */
-#ifdef OVL2
-
 STATIC_OVL char
 obj_to_let(obj)	/* should of course only be called for things in invent */
 register struct obj *obj;
@@ -1587,9 +1550,6 @@ long quan;
 	      xprname(obj, (char *)0, obj_to_let(obj), TRUE, 0L, quan));
 }
 
-#endif /* OVL2 */
-#ifdef OVL1
-
 char *
 xprname(obj, txt, let, dot, cost, quan)
 struct obj *obj;
@@ -1638,9 +1598,6 @@ long quan;		/* if non-0, print this quantity, not obj->quan */
     return li;
 }
 
-#endif /* OVL1 */
-#ifdef OVLB
-
 /* the 'i' command */
 int
 ddoinv()
@@ -2300,9 +2257,6 @@ boolean force_touch;
 	}
 }
 
-#endif /* OVLB */
-#ifdef OVL1
-
 void
 stackobj(obj)
 struct obj *obj;
@@ -2413,9 +2367,6 @@ doprgold()
 	return 0;
 }
 
-#endif /* OVL1 */
-#ifdef OVLB
-
 int
 doprwep()
 {
@@ -2558,11 +2509,6 @@ long numused;
 	    u.uundetected = OBJ_AT(u.ux, u.uy);
 }
 
-#endif /* OVLB */
-
-
-#ifdef OVL1
-
 /*
  * Conversion from a class to a string for printing.
  * This must match the object class order.
@@ -2623,9 +2569,6 @@ free_invbuf()
 	invbufsiz = 0;
 }
 
-#endif /* OVL1 */
-#ifdef OVLB
-
 void
 reassign()
 {
@@ -2637,9 +2580,6 @@ reassign()
 	lastinvnr = i;
 }
 
-#endif /* OVLB */
-#ifdef OVL1
-
 int
 doorganize()	/* inventory organizer by Del Lamb */
 {
@@ -2927,6 +2867,4 @@ boolean as_if_seen;
 	return n;
 }
 
-#endif /* OVL1 */
-
 /*invent.c*/