Fix: SE005 Problem: Documentation is full of out of date references to NetHack. These need to be changed to reflect the changes made in Slash'EM. A number of these are back-ported from Debian. Compatible with: Slash'EM 0.0.5E3 (and some earlier) (except Debian) Slash'EM 0.0.5E4 (Warren's code only) Obsoleted by: Slash'EM 0.0.5E4 UNIX distribuion Author: Peter Makholm, peter@makholm.net J. Ali Harlow, ali@avrc.city.ac.uk Date: 18 Aug 1999 *** doc/Guidebook.mn.orig Tue Jul 20 09:59:30 1999 --- doc/Guidebook.mn Wed Aug 18 16:17:18 1999 *************** *** 617,623 **** .lp M-d Dip an object into something. .lp M-e ! Activate special class effect. Same as ``#effect'' .lp M-f Force a lock. .lp M-i --- 617,623 ---- .lp M-d Dip an object into something. .lp M-e ! Advance or check weapons skills. .lp M-f Force a lock. .lp M-i *************** *** 643,649 **** .lp M-s Sit down. .lp M-t ! Turn undead. .lp M-u Untrap something (trap, door, or chest). .lp M-v --- 643,649 ---- .lp M-s Sit down. .lp M-t ! Use a class specific technique. .lp M-u Untrap something (trap, door, or chest). .lp M-v *** doc/slashem.6.orig Thu Jul 8 10:44:40 1999 --- doc/slashem.6 Wed Aug 18 16:17:17 1999 *************** *** 76,82 **** Precious stones may be worth a lot of gold when brought to the exit. There is a 10% penalty for getting yourself killed. .PP ! The environment variable NETHACKOPTIONS can be used to initialize many run-time options. The ? command provides a description of these options and syntax. (The --- 76,82 ---- Precious stones may be worth a lot of gold when brought to the exit. There is a 10% penalty for getting yourself killed. .PP ! The environment variable SLASHEMOPTIONS can be used to initialize many run-time options. The ? command provides a description of these options and syntax. (The *************** *** 95,102 **** .B \-u .I playername option supplies the answer to the question "Who are you?". ! It overrides any name from NETHACKOPTIONS, HACKOPTIONS, USER, LOGNAME, ! or getlogin(), which will otherwise be tried in order. If none of these provides a useful name, the player will be asked for one. Player names (in conjunction with uids) are used to identify save files, so you can have several saved games under different names. --- 95,102 ---- .B \-u .I playername option supplies the answer to the question "Who are you?". ! It overrides any name from SLASHEMOPTIONS, NETHACKOPTIONS, HACKOPTIONS, USER, ! LOGNAME, or getlogin(), which will otherwise be tried in order. If none of these provides a useful name, the player will be asked for one. Player names (in conjunction with uids) are used to identify save files, so you can have several saved games under different names. *************** *** 152,158 **** supplies a directory which is to serve as the playground. It overrides the value from NETHACKDIR, HACKDIR, or the directory specified by the game administrator during compilation ! (usually /usr/games/lib/nethackdir). This option is usually only useful to the game administrator. The playground must contain several auxiliary files such as help files, the list of top scorers, and a subdirectory --- 152,158 ---- supplies a directory which is to serve as the playground. It overrides the value from NETHACKDIR, HACKDIR, or the directory specified by the game administrator during compilation ! (usually /usr/local/slashemdir). This option is usually only useful to the game administrator. The playground must contain several auxiliary files such as help files, the list of top scorers, and a subdirectory *************** *** 185,191 **** improvements to the bloated behemoth. .SH FILES .PP ! All files are in the playground, normally /usr/games/lib/nethackdir. If DLB was defined during the compile, the data files and special levels will be inside a larger file, normally nhdat, instead of being separate files. --- 185,191 ---- improvements to the bloated behemoth. .SH FILES .PP ! All files are in the playground, normally /usr/local/slashemdir. If DLB was defined during the compile, the data files and special levels will be inside a larger file, normally nhdat, instead of being separate files. *************** *** 258,264 **** .br NETHACKDIR Playground. .br ! NETHACKOPTIONS String predefining several NetHack .br options. .br --- 258,264 ---- .br NETHACKDIR Playground. .br ! SLASHEMOPTIONS String predefining several SLASH'EM .br options. .br *** src/options.c.orig Sat Jul 31 00:51:06 1999 --- src/options.c Wed Aug 18 16:17:19 1999 *************** *** 502,508 **** obj_descr[SLIME_MOLD].oc_name = "fruit"; #ifndef ROLE_PATCH /* KMH, role patch -- now obsolete */ ! if (flags.female) { /* should have been set in NETHACKOPTIONS */ roles[2] = "Cavewoman"; roles[13] = "Priestess"; } --- 502,508 ---- obj_descr[SLIME_MOLD].oc_name = "fruit"; #ifndef ROLE_PATCH /* KMH, role patch -- now obsolete */ ! if (flags.female) { /* should have been set in NETHACK_ENV_OPTIONS */ roles[2] = "Cavewoman"; roles[13] = "Priestess"; } *************** *** 617,624 **** # endif pline("\"%s\" settable only from %s.", optname, configfile); #else ! pline("%s can be set only from NETHACKOPTIONS or %s.", optname, ! configfile); #endif } --- 617,624 ---- # endif pline("\"%s\" settable only from %s.", optname, configfile); #else ! pline("%s can be set only from %s or %s.", optname, ! NETHACK_ENV_OPTIONS, configfile); #endif } *************** *** 639,645 **** if(from_file) raw_printf("Bad syntax in OPTIONS in %s: %s.", configfile, opts); else ! raw_printf("Bad syntax in NETHACKOPTIONS: %s.", opts); # ifdef AMIGA } # endif --- 639,645 ---- if(from_file) raw_printf("Bad syntax in OPTIONS in %s: %s.", configfile, opts); else ! raw_printf("Bad syntax in %s: %s.", NETHACK_ENV_OPTIONS, opts); # ifdef AMIGA } # endif *************** *** 1704,1710 **** #if defined(MICRO) || defined(MAC) # define OPTIONS_HEADING "OPTIONS" #else ! # define OPTIONS_HEADING "NETHACKOPTIONS" #endif static void --- 1704,1710 ---- #if defined(MICRO) || defined(MAC) # define OPTIONS_HEADING "OPTIONS" #else ! # define OPTIONS_HEADING NETHACK_ENV_OPTIONS #endif static void *************** *** 1942,1955 **** /* data for option_help() */ static const char *opt_intro[] = { "", ! " NetHack Options Help:", "", #define CONFIG_SLOT 3 /* fill in next value at run-time */ (char *)0, #if !defined(MICRO) && !defined(MAC) ! "or use `NETHACKOPTIONS=\"\"' in your environment;", # ifdef VMS ! "-- for example, $ DEFINE NETHACKOPTIONS \"noautopickup,fruit:kumquat\"", # endif #endif "or press \"O\" while playing, and type your at the prompt.", --- 1942,1956 ---- /* data for option_help() */ static const char *opt_intro[] = { "", ! " SlashEM Options Help:", "", #define CONFIG_SLOT 3 /* fill in next value at run-time */ (char *)0, + #define ENV_SLOT 4 /* substitute variable name in next value at run-time */ #if !defined(MICRO) && !defined(MAC) ! "or use `%s=\"\"' in your environment;", # ifdef VMS ! "-- for example, $ DEFINE %s \"noautopickup,fruit:kumquat\"", # endif #endif "or press \"O\" while playing, and type your at the prompt.", *************** *** 1982,1988 **** Sprintf(buf, "Set options as OPTIONS= in %s;", configfile); opt_intro[CONFIG_SLOT] = (const char *) buf; for (i = 0; opt_intro[i]; i++) ! putstr(datawin, 0, opt_intro[i]); /* Boolean options */ for (i = 0; boolopt[i].name; i++) { --- 1983,1995 ---- Sprintf(buf, "Set options as OPTIONS= in %s;", configfile); opt_intro[CONFIG_SLOT] = (const char *) buf; for (i = 0; opt_intro[i]; i++) ! if (i==ENV_SLOT) ! { ! Sprintf(buf2, opt_intro[ENV_SLOT], NETHACK_ENV_OPTIONS); ! putstr(datawin, 0, buf2);; ! } ! else ! putstr(datawin, 0, opt_intro[i]); /* Boolean options */ for (i = 0; boolopt[i].name; i++) {