Make KOPS unconditional.

src/shk.c

@@ -13,11 +13,9 @@
 #define PAY_SKIP  (-1)
 #define PAY_BROKE (-2)
 
-#ifdef KOPS
 STATIC_DCL void FDECL(makekops, (coord *));
 STATIC_DCL void FDECL(call_kops, (struct monst *,BOOLEAN_P));
 STATIC_DCL void FDECL(kops_gone, (BOOLEAN_P));
-#endif /* KOPS */
 
 #define NOTANGRY(mon)	((mon)->mpeaceful)
 #define ANGRY(mon)	(!NOTANGRY(mon))
@@ -313,7 +311,6 @@ register struct monst *shkp;
 	return(total);
 }
 
-#ifdef KOPS
 STATIC_OVL void
 call_kops(shkp, nearshop)
 register struct monst *shkp;
@@ -364,7 +361,6 @@ register boolean nearshop;
 	    makekops(&mm);
 	}
 }
-#endif	/* KOPS */
 
 /* x,y is strictly inside shop */
 char
@@ -420,11 +416,7 @@ boolean newlev;
 	}
 
 	if (rob_shop(shkp)) {
-#ifdef KOPS
 	    call_kops(shkp, (!newlev && levl[u.ux0][u.uy0].edge));
-#else
-	    (void) angry_guards(FALSE);
-#endif
 	}
 }
 
@@ -445,12 +437,8 @@ xchar x, y;
 	    return;
 
 	if (rob_shop(shkp)) {
-#ifdef KOPS
 	    /*[might want to set 2nd arg based on distance from shop doorway]*/
 	    call_kops(shkp, FALSE);
-#else
-	    (void) angry_guards(FALSE);
-#endif
 	}
 }
 
@@ -941,11 +929,7 @@ register boolean killkops;
 	(void) mnearto(shkp, x, y, TRUE);
 	level.flags.has_shop = 1;
 	if (killkops) {
-#ifdef KOPS
 		kops_gone(TRUE);
-#else
-		You_feel("vaguely apprehensive.");
-#endif
 		pacify_guards();
 	}
 	after_shk_move(shkp);
@@ -1065,9 +1049,7 @@ make_happy_shoppers(silentkops)
 boolean silentkops;
 {
 	if (!angry_shk_exists()) {
-#ifdef KOPS
 		kops_gone(silentkops);
-#endif
 		pacify_guards();
 	}
 }
@@ -3655,7 +3637,6 @@ register int fall;
     }
 }
 
-#ifdef KOPS
 STATIC_OVL void
 makekops(mm)
 coord *mm;
@@ -3680,7 +3661,6 @@ coord *mm;
 		    (void) makemon(&mons[mndx], mm->x, mm->y, NO_MM_FLAGS);
 	}
 }
-#endif	/* KOPS */
 
 void
 pay_for_damage(dmgstr, cant_mollify)
@@ -4052,7 +4032,6 @@ struct monst *shkp;
 		pline("%s talks about the problem of shoplifters.",shkname(shkp));
 }
 
-#ifdef KOPS
 STATIC_OVL void
 kops_gone(silent)
 register boolean silent;
@@ -4071,7 +4050,6 @@ register boolean silent;
 	    pline_The("Kop%s (disappointed) vanish%s into thin air.",
 		      plur(cnt), cnt == 1 ? "es" : "");
 }
-#endif	/* KOPS */
 
 STATIC_OVL long
 cost_per_charge(shkp, otmp, altusage)