nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

more SYSCF and related bits - cleanup and features

Browse Source 
infrastructure for "system options" - things currently specified at build
 time that should be changeable at install time or run time but not really
 under user control
generalize contact info so it can be localized and it doesn't have to be
 an email address
move recently introduced WIZARDS into sysopt
drop bogus OPTIONS=wizards possibility
new function build_english_list() to comma-ize and add 'or' from a whitespace separated list: A.  A or B.  A, B, or C.
syscf file now handles: WIZARDS SUPPORT RECOVER
 SUPPORT specifies local support information
 RECOVER will eventually supply port-specific and/or localized info on how
  to run recover (or get it run for you).
Note: in sys/msdos I changed sys.o (generated from pcsys.c) to pcsys.o
Note: sys/msdos/Makefile.GCC has 2 rules for sys.o (now pcsys.o)
This commit is contained in:
keni
2008-01-31 00:56:59 +00:00
parent d8a45a57b5
commit 6f0e178368
32 changed files with 329 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sys/unix/Install.unx
View File

@@ -87,7 +87,19 @@
wish to override the compiled-in defaults:
WIZARDS= a space-separated list of usernames who can use -D
If the first character is '*' then any user can use -D.
This is a standards config file, so blank lines and lines starting with
SUPPORT= one line, probably starting with a verb, telling how to
contact your local support person/group for NetHack. If there
is no local support, do not use this line. Some sample values:
call Joan at +1 312 555-1234.
email support@example.com
visit http://www.example.com/game-support
RECOVER= instructions for running recover. If RECOVER is not available,
do not use this line. Some sample values:
To get your game recovered, contact support.
Run /usr/local/bin/nh-recover to recover your game.
This is a standard config file, so blank lines and lines starting with
pound signs are ignored; while other, standard options (such as catname)
can be specified in this file, this is considered a bug and may be changed
in the future.

11
sys/unix/Makefile.src
View File

@@ -1,5 +1,5 @@
# NetHack Makefile.
# SCCS Id: @(#)Makefile.src 3.5 2007/12/12
# SCCS Id: @(#)Makefile.src 3.5 2008/01/30
# newer makes predefine $(MAKE) to 'make' and do smarter processing of
# recursive make calls if $(MAKE) is used
@@ -327,7 +327,8 @@ HACKCSRC = allmain.c alloc.c apply.c artifact.c attrib.c ball.c bones.c \
options.c pager.c pickup.c pline.c polyself.c potion.c pray.c \
priest.c quest.c questpgr.c read.c rect.c region.c restore.c rip.c \
rnd.c role.c rumors.c save.c shk.c shknam.c sit.c sounds.c sp_lev.c \
spell.c steal.c steed.c teleport.c timeout.c topten.c track.c trap.c \
spell.c steal.c steed.c sys.c teleport.c timeout.c topten.c track.c \
trap.c \
u_init.c uhitm.c vault.c version.c vision.c weapon.c were.c wield.c \
windows.c wizard.c worm.c worn.c write.c zap.c
@@ -362,7 +363,7 @@ HACKINCL = align.h amiconf.h artifact.h artilist.h attrib.h beconf.h color.h \
macconf.h mextra.h mfndpos.h micro.h mkroom.h \
monattk.h mondata.h monflag.h monst.h monsym.h obj.h objclass.h \
os2conf.h patchlevel.h pcconf.h permonst.h prop.h rect.h region.h rm.h \
sp_lev.h spell.h system.h tcap.h timeout.h tosconf.h tradstdc.h \
sp_lev.h spell.h sys.h system.h tcap.h timeout.h tosconf.h tradstdc.h \
trampoli.h trap.h unixconf.h vision.h vmsconf.h wintty.h \
winX.h winprocs.h wintype.h you.h youprop.h
@@ -384,6 +385,7 @@ HOBJ = $(FIRSTOBJ) allmain.o alloc.o apply.o artifact.o attrib.o ball.o \
pager.o pickup.o pline.o polyself.o potion.o pray.o priest.o \
quest.o questpgr.o read.o rect.o region.o restore.o rip.o rnd.o \
role.o rumors.o save.o shk.o shknam.o sit.o sounds.o sp_lev.o spell.o \
sys.o \
steal.o steed.o teleport.o timeout.o topten.o track.o trap.o u_init.o \
uhitm.o vault.o vision.o vis_tab.o weapon.o were.o wield.o windows.o \
wizard.o worm.o worn.o write.o zap.o \
@@ -572,7 +574,7 @@ $(HACK_H): ../include/hack.h $(CONFIG_H) ../include/align.h \
../include/flag.h ../include/rm.h ../include/vision.h \
../include/display.h ../include/engrave.h ../include/rect.h \
../include/region.h ../include/winprocs.h ../include/wintty.h \
../include/trampoli.h
../include/trampoli.h ../include/sys.h
touch $(HACK_H)
#
tos.o: ../sys/atari/tos.c $(HACK_H) ../include/tcap.h
@@ -790,6 +792,7 @@ sp_lev.o: sp_lev.c $(HACK_H) ../include/dlb.h ../include/sp_lev.h
spell.o: spell.c $(HACK_H)
steal.o: steal.c $(HACK_H)
steed.o: steed.c $(HACK_H)
sys.o: sys.c $(HACK_H)
teleport.o: teleport.c $(HACK_H)
timeout.o: timeout.c $(HACK_H) ../include/lev.h
topten.o: topten.c $(HACK_H) ../include/dlb.h ../include/patchlevel.h

12
sys/unix/unixmain.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)unixmain.c 3.5 2007/02/14 */
/* SCCS Id: @(#)unixmain.c 3.5 2008/01/30 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -54,6 +54,8 @@ char *argv[];
boolean exact_username;
boolean resuming = FALSE; /* assume new game */
sys_early_init();
#if defined(__APPLE__)
/* special hack to change working directory to a resource fork when
running from finder --sam */
@@ -540,11 +542,11 @@ authorize_wizard_mode()
}
}
#ifdef SYSCF
if (pw && wizards[0]) {
if(wizards[0] == '*') return TRUE; /*allow any user to be wizard*/
if (pw && sysopt.wizards[0]) {
if(sysopt.wizards[0] == '*') return TRUE; /*allow any user to be wizard*/
int pwlen = strlen(pw->pw_name);
char *eop = eos(wizards);
char *w = wizards;
char *eop = eos(sysopt.wizards);
char *w = sysopt.wizards;
while( w+pwlen <= eop ){
if( ! *w ) break;
if( isspace(*w) ){ w++; continue;}