From e6bc749f83d69a67c5682e6a2f14411157b24305 Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Sat, 6 Aug 2011 19:32:58 +0000
Subject: Remove the PYRAMID_BUG code. I don't think Pyramids are coming back,
 nor do we care if their compiler vomits trying to decrement a bitfield.

---
 hack/config.h      |  3 +--
 hack/hack.u_init.c | 12 ++----------
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'hack')

diff --git a/hack/config.h b/hack/config.h
index ad3bbcfb..c00e4361 100644
--- a/hack/config.h
+++ b/hack/config.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: config.h,v 1.7 2003/04/02 18:36:33 jsm Exp $	*/
+/*	$NetBSD: config.h,v 1.8 2011/08/06 19:32:58 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -85,7 +85,6 @@
 
 /* #define STUPID */	/* avoid some complicated expressions if
 			   your C compiler chokes on them */
-/* #define PYRAMID_BUG */	/* avoid a bug on the Pyramid */
 /* #define NOWAITINCLUDE */	/* neither <wait.h> nor <sys/wait.h> exists */
 
 #define WIZARD  "bruno"	/* the person allowed to use the -D option */
diff --git a/hack/hack.u_init.c b/hack/hack.u_init.c
index b20bf1de..d2849115 100644
--- a/hack/hack.u_init.c
+++ b/hack/hack.u_init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hack.u_init.c,v 1.12 2010/02/03 15:34:39 roy Exp $	*/
+/*	$NetBSD: hack.u_init.c,v 1.13 2011/08/06 19:32:58 dholland Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.u_init.c,v 1.12 2010/02/03 15:34:39 roy Exp $");
+__RCSID("$NetBSD: hack.u_init.c,v 1.13 2011/08/06 19:32:58 dholland Exp $");
 #endif				/* not lint */
 
 #include <ctype.h>
@@ -377,16 +377,8 @@ ini_inv(struct trobj *trop)
 		if (obj->olet == WEAPON_SYM)
 			if (!uwep)
 				setuwep(obj);
-#ifndef PYRAMID_BUG
 		if (--trop->trquan)
 			continue;	/* make a similar object */
-#else
-		if (trop->trquan) {	/* check if zero first */
-			--trop->trquan;
-			if (trop->trquan)
-				continue;	/* make a similar object */
-		}
-#endif	/* PYRAMID_BUG */
 		trop++;
 	}
 }
-- 
cgit v1.2.3-56-ge451