aboutsummaryrefslogtreecommitdiffstats
path: root/games/hack
diff options
context:
space:
mode:
authorsvn2git <svn2git@FreeBSD.org>1994-05-01 00:00:00 -0800
committersvn2git <svn2git@FreeBSD.org>1994-05-01 00:00:00 -0800
commita16f65c7d117419bd266c28a1901ef129a337569 (patch)
tree2626602f66dc3551e7a7c7bc9ad763c3bc7ab40a /games/hack
parent8503f4f13f77abf7adc8f7e329c6f9c1d52b6a20 (diff)
downloadsrc-a16f65c7d117419bd266c28a1901ef129a337569.tar.gz
src-a16f65c7d117419bd266c28a1901ef129a337569.zip
Release FreeBSD 1.1release/1.1.0_cvs
This commit was manufactured to restore the state of the 1.1-RELEASE image. Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs.
Diffstat (limited to 'games/hack')
-rw-r--r--games/hack/Makefile4
-rw-r--r--games/hack/hack.62
-rw-r--r--games/hack/hack.apply.c2
-rw-r--r--games/hack/hack.invent.c2
-rw-r--r--games/hack/hack.mkshop.c6
-rw-r--r--games/hack/hack.version.c2
6 files changed, 10 insertions, 8 deletions
diff --git a/games/hack/Makefile b/games/hack/Makefile
index 0432786c3a1a..cc1af7a77784 100644
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -12,7 +12,7 @@ SRCS= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \
hack.timeout.c hack.topl.c hack.track.c hack.trap.c hack.tty.c \
hack.u_init.c hack.unix.c hack.vault.c hack.version.c hack.wield.c \
hack.wizard.c hack.worm.c hack.worn.c hack.zap.c rnd.c
-CFLAGS+= -I.
+CFLAGS+= -I. -fwritable-strings
MAN6= hack.6
DPSRCS= hack.onames.h
DPADD= ${LIBTERM}
@@ -35,4 +35,6 @@ beforeinstall:
${.CURDIR}/hh ${.CURDIR}/data ${DESTDIR}/var/games/hackdir
rm -f ${DESTDIR}/var/games/hackdir/bones*
+.depend alloc.o: hack.onames.h
+
.include <bsd.prog.mk>
diff --git a/games/hack/hack.6 b/games/hack/hack.6
index c4c46c30c2e0..5210c2630bcd 100644
--- a/games/hack/hack.6
+++ b/games/hack/hack.6
@@ -52,7 +52,7 @@ When the game ends, either by your death, when you quit, or if you escape
from the caves,
.I hack
will give you (a fragment of) the list of top scorers. The scoring
-is based on many aspects of your behaviour but a rough estimate is
+is based on many aspects of your behavior but a rough estimate is
obtained by taking the amount of gold you've found in the cave plus four
times your (real) experience. Precious stones may be worth a lot of gold
when brought to the exit.
diff --git a/games/hack/hack.apply.c b/games/hack/hack.apply.c
index ebdf82adce54..18da738dfe9c 100644
--- a/games/hack/hack.apply.c
+++ b/games/hack/hack.apply.c
@@ -4,7 +4,7 @@
#include "hack.h"
#include "def.edog.h"
#include "def.mkroom.h"
-extern struct monst *bchit();
+static struct monst *bchit();
extern struct obj *addinv();
extern struct trap *maketrap();
extern int (*occupation)();
diff --git a/games/hack/hack.invent.c b/games/hack/hack.invent.c
index c4620ca129cb..66949b87afe1 100644
--- a/games/hack/hack.invent.c
+++ b/games/hack/hack.invent.c
@@ -7,7 +7,7 @@ extern struct obj *splitobj();
extern struct obj zeroobj;
extern char morc;
extern char quitchars[];
-char *xprname();
+static char *xprname();
#ifndef NOWORM
#include "def.wseg.h"
diff --git a/games/hack/hack.mkshop.c b/games/hack/hack.mkshop.c
index 9d99a22d2cb2..7a8fdfbfaaa6 100644
--- a/games/hack/hack.mkshop.c
+++ b/games/hack/hack.mkshop.c
@@ -19,10 +19,10 @@ register char let;
int roomno;
register struct monst *shk;
#ifdef WIZARD
+extern char *getenv();
+register char *ep = getenv("SHOPTYPE");
/* first determine shoptype */
if(wizard){
- extern char *getenv();
- register char *ep = getenv("SHOPTYPE");
if(ep){
if(*ep == 'z' || *ep == 'Z'){
mkzoo(ZOO);
@@ -58,7 +58,7 @@ gottype:
continue;
if(
#ifdef WIZARD
- (wizard && getenv("SHOPTYPE") && sroom->doorct != 0) ||
+ (wizard && ep != NULL && sroom->doorct != 0) ||
#endif WIZARD
sroom->doorct <= 2 && sroom->doorct > 0) break;
}
diff --git a/games/hack/hack.version.c b/games/hack/hack.version.c
index 4c89fe739b90..ae0a12d3535e 100644
--- a/games/hack/hack.version.c
+++ b/games/hack/hack.version.c
@@ -1,6 +1,6 @@
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* hack.version.c - version 1.0.3 */
-/* $Header: /a/cvs/386BSD/src/games/hack/hack.version.c,v 1.1.1.1 1993/06/12 14:40:26 rgrimes Exp $ */
+/* $Header: /home/cvs/386BSD/src/games/hack/hack.version.c,v 1.1.1.1 1993/06/12 14:40:26 rgrimes Exp $ */
#include "date.h"