Remove vestiges of old overlay source split

[trunk only]

src/weapon.c

@@ -28,14 +28,6 @@
 
 STATIC_DCL void FDECL(give_may_advance_msg, (int));
 
-#ifndef OVLB
-
-STATIC_DCL NEARDATA const short skill_names_indices[];
-STATIC_DCL NEARDATA const char *odd_skill_names[];
-STATIC_DCL NEARDATA const char *barehands_or_martial[];
-
-#else	/* OVLB */
-
 STATIC_VAR NEARDATA const short skill_names_indices[P_NUM_SKILLS] = {
 	0,                DAGGER,         KNIFE,        AXE,
 	PICK_AXE,         SHORT_SWORD,    BROADSWORD,   LONG_SWORD,
@@ -92,27 +84,19 @@ int skill;
 		"fighting ");
 }
 
-#endif	/* OVLB */
-
 STATIC_DCL boolean FDECL(can_advance, (int, BOOLEAN_P));
 STATIC_DCL boolean FDECL(could_advance, (int));
 STATIC_DCL boolean FDECL(peaked_skill, (int));
 STATIC_DCL int FDECL(slots_required, (int));
-
-#ifdef OVL1
-
 STATIC_DCL char *FDECL(skill_level_name, (int,char *));
 STATIC_DCL void FDECL(skill_advance, (int));
 
-#endif	/* OVL1 */
-
 #define P_NAME(type) ((skill_names_indices[type] > 0) ? \
 		      OBJ_NAME(objects[skill_names_indices[type]]) : \
 		      (type == P_BARE_HANDED_COMBAT) ? \
 			barehands_or_martial[martial_bonus()] : \
 			odd_skill_names[-skill_names_indices[type]])
 
-#ifdef OVLB
 static NEARDATA const char kebabable[] = {
 	S_XORN, S_DRAGON, S_JABBERWOCK, S_NAGA, S_GIANT, '\0'
 };
@@ -314,9 +298,6 @@ struct monst *mon;
 	return(tmp);
 }
 
-#endif /* OVLB */
-#ifdef OVL0
-
 STATIC_DCL struct obj *FDECL(oselect, (struct monst *,int));
 #define Oselect(x)	if ((otmp = oselect(mtmp, x)) != 0) return(otmp);
 
@@ -709,9 +690,6 @@ abon()		/* attack bonus for strength & dexterity */
 	else return(sbon + dex-14);
 }
 
-#endif /* OVL0 */
-#ifdef OVL1
-
 int
 dbon()		/* damage bonus for strength */
 {
@@ -1006,9 +984,6 @@ int skill;
     }
 }
 
-#endif /* OVL1 */
-#ifdef OVLB
-
 void
 use_skill(skill,degree)
 int skill;
@@ -1314,6 +1289,4 @@ register struct obj *obj;
     obj->owornmask &= ~W_WEP;
 }
 
-#endif /* OVLB */
-
 /*weapon.c*/