Fix: SE062 Problem: A number of niggles: There are still some nested comments. README.32 should be replaced with README.33 (and UPDATE.322 removed). The Qt interface is missing from the list of supported windowing interfaces produced by the #version command. Remove obsolete pet name options. gender option appears twice. {ibm,dec,max}_graphics: altar & graves are the wrong way around, plus bars, trees and ladders should follow vanilla. Note: This fix only removes nested comments from the core and windowing code; system specific code (in ./sys) may still have instances. Compatible with: Slash'EM 0.0.6E0F3 + SE058 Author: J. Ali Harlow, ali@avrc.city.ac.uk Date: 7 Apr 2000 diff -Nacrd ../slashem-0.0.6E0F3+SE058/README.32 ./README.32 *** ../slashem-0.0.6E0F3+SE058/README.32 Fri Apr 7 18:43:09 2000 --- ./README.32 Thu Jan 1 01:00:00 1970 *************** *** 1,200 **** - - NetHack 3.2 -- General information - - NetHack 3.2 is a new enhancement to the dungeon exploration game NetHack. - It is a distant descendent of Rogue and Hack, and a direct descendent of - NetHack 3.1 and 3.0. - - NetHack 3.2 is the product of two years of very intensive effort by the - NetHack Development Team and its porting sub-teams. Many parts of 3.1 were - re-written for NetHack 3.2, and many new features were added. - - The new additions and changes in the game include: - - Warwick Allison has introduced enhancements the game's display code to - support a more graphical appearance with the X11, MS-DOS and Amiga display - system. The display can now use a "tile" based system which is better at - displaying uniquely identifiable information about the player's surroundings. - - The spell casting system has been dramatically changed. The source of these - changes was the code developed by Stephen White, who wrote the NH++ patch kit. - These changes have been re-integrated into NetHack with appropriate - modifications required to balance them for the 3.2 release. - - We have also added a weapons proficiency system to allow for "learning" - how to use weapons effectively and reflecting that proficiency in combat. - Also based on code by Stephen White. - - Many inventory and item choice interfaces are now menu oriented with an - option to toggle back and forth to the original (3.1) interface. - - These are some of the most prominent global changes, but there are many - other changes in the game, and they are no less dramatic. - - This version of the game is special in one way. During the development of - 3.2 (at that point in time it might have actually become 3.1.4), one of the - members of the Development Team, Izchak Miller, passed away. This version - of the game is dedicated to the memory of Izchak Miller, and his invaluable - contributions to the evolution of NetHack over the past 10 years. - - - - - - - - - - - - - - - Please read items (1), (2) and (3) BEFORE doing anything with your new code. - - 1. Unpack the code in a dedicated new directory. We will refer to that - directory as the 'Top' directory. It makes no difference what you - call it. - - 2. If there is no flaw in the packaging, many sub-directories will be - automatically created, and files will be deposited in them: - - a. A 'dat' directory, which contains a variety of data files. - b. A 'doc' directory, which contains various documentation. - c. An 'include' directory, which contains *.h files. - d. A 'src' directory, which contains game *.c files used by all versions. - e. A 'util' directory, which contains files for utility programs. - f. A 'sys' directory, which contains subdirectories for files that - are operating-system specific. - g. A 'sys/share' subdirectory, which contains files shared by some OSs. - h. A 'sys/share/sounds' subsubdirectory, which contains sound files - shared by some OSs. - i. A 'sys/amiga' subdirectory, which contains files specific to AmigaDOS. - j. A 'sys/amiga/splitter' subsubdirectory, which contains files - for the Amiga splitter program. - k. A 'sys/atari' subdirectory, which contains files specific to TOS. - l. A 'sys/be' subdirectory, which contains files specific to Be OS. - m. A 'sys/mac' subdirectory, which contains files specific to MacOS. - n. A 'sys/mac/old' subdirectory which contains files used by - untested compilers. - o. A 'sys/msdos' subdirectory, which contains files specific to MS-DOS. - p. A 'sys/msdos/old' subsubdirectory, which contains files for old - MS-DOS compilers (no longer officially supported). - q. A 'sys/os2' subdirectory, which contains files specific to OS/2. - r. A 'sys/unix' subdirectory, which contains files specific to UNIX. - s. A 'sys/vms' subdirectory, which contains files specific to VMS. - t. A 'sys/winnt' subdirectory, which contains files specific to Windows NT. - u. A 'win' directory, which contains subdirectories for files that - are windowing-system specific (but not operating-system specific). - v. A 'win/share' subdirectory, which contains files shared by some - windowing systems. - w. A 'win/tty' subdirectory, which contains files specific to ttys. - x. A 'win/win32' subdirectory, which contains files specific to the - Windows NT Win32 API. - y. A 'win/X11' subdirectory, which contains files specific to X11. - - The names of these directories should not be changed unless you are - ready to go through the makefiles and the makedefs program and change - all the directory references in them. - - 3. Having unpacked, you should have a file called 'Files' in your Top - directory. This file contains the list of all the files you now SHOULD - have in each directory. Please check the files in each directory - against this list to make sure that you have a complete set. - - 4. Before you do anything else, please read carefully the file called - "license" in the 'dat' subdirectory. It is expected that you comply - with the terms of that license, and we are very serious about it. In - particular, you are prohibited by the terms of the license from using - NetHack 3.2 for gainful purposes. - - 5. If everything is in order, you can now turn to trying to get the program - to compile and run on your particular system. It is worth mentioning - that the default configuration is BSD/Sun/SunOS4.x (simply because - the code was housed on such a system). It is also worth mentioning - here that NetHack 3.2 is a huge program. If you intend to run it on a - small machine, you'll have to make hard choices among the options - available in config.h. - - The files sys/*/Install.* were written to guide you in configuring the - program for your operating system. The files win/*/Install.* are - available, where necessary, to help you in configuring the program - for particular windowing environments. Reading them, and the man pages, - should answer most of your questions. - - At the time of this release, NetHack 3.2 is known to run/compile on: - - AT&T 3B1 running System V (3.51) - Data General AViiON systems running DG/UX - DEC vaxen running Ultrix - Decstations running Ultrix 4.x - HP 9000s700 running HP-UX 9.x and 10.x - IBM PC/RT and RS/6000 running AIX 3.x - NeXT running Mach (using BSD configuration) - Sun-4s running SunOS 4.x - Sun-4s running Solaris 2.x (aka SunOS 5.x) - SGI Iris running IRIX - 386/486/Pentium boxes running Linux/BSDI - - Apple Macintosh running MacOS - Atari ST/TT/Falcon running TOS (or MultiTOS) with GCC - Commodore Amiga running AmigaDOS 1.3 or greater with SAS/C 6.55 - (but see Install.ami about DICE and Manx) - DEC Alpha/VMS (aka OpenVMS AXP), running V1.x through V7.0 - DEC VAX/VMS, running V4.6 through V7.0 - IBM PC compatibles running MS-DOS with MicroSoft C, Borland C++ 3.1, or - DJGPP. It is recommended to have at least an 80386 processor. - Intel (80386 or greater) and DEC Alpha desktop machines - running Windows NT - Intel (80386 or greater) running Windows 95 - - Previous versions of NetHack were tested on the following systems, - and we expect that NetHack 3.2 will work on them as well: - - AT&T 3B2/600 & 3B2/622 running System V R3.2.1 - AT&T 3B2/1000 Model 80 running System V R3.2.2 - AT&T 3B4000 running System V - AT&T 6386 running System V R3.2 - DEC vaxen running BSD - Decstations running Ultrix 3.1 - Encore Multimax running UMAX 4.2 - Gould NP1 running UTX 3/2 - HP 9000s300 running HP-UX - Mips M2000 running RiscOS 4.1 - Pyramid 9820x running OSx 4.4c - Stardent Vistra 800 running SysV R4.0 - Stride 460 running UniStride 2.1 - Sun-3s, -4s, and -386is running SunOS 3.x - Sun-3s and -386is running SunOS 4.x - Valid Logic Systems SCALD-System - 286 box running Microport SysV/AT (not extensively tested) - 386/486/Pentium boxes running 386BSD - IBM PS/2 and AT compatibles running OS/2 1.1 - 2.0 (and probably - Warp) with Microsoft 6.0, and OS/2 2.0 and up with GCC emx or - IBM CSet++ 2.0. - - Unless otherwise mentioned, the compiler used was the OS-vendor's - C compiler. - - - - - - - - - - - - - - - If you have problems building the game, or you find bugs in it, the - development team may be reached as - - nethack-bugs@linc.cis.upenn.edu - - Please be sure to include your machine type, OS, and patchlevel. - - Patches especially should be directed to this address. If you've changed - something to get NetHack to run on your system, it's likely that others have - done it by making slightly different modifications. By routing your patches - through the development team, we should be able to avoid making everyone else - choose among variant patches claiming to do the same thing, to keep most of - the copies of 3.2 synchronized by means of official patches, and to maintain - the painfully-created file organization. (This process has been working since - the time when everyone just posted their own patches to 2.3. At that time, - there were no archived bug-fixes to give to people who got 2.3 after its initial - release, so the same bugs kept being discovered by new batches of people.) - We have been successful in preventing this from happening since the 3.0 - release. Please cooperate to keep this from happening to 3.2. - - It is inevitable that we will reject some proposed additions of new features - either because they do not fit our conception of the game, or because they - require more code than we consider they're worth. If we reject your feature, - you are free, of course, to post the patches to the net yourself and let the - marketplace decide their worth. - - All of this amounts to the following: If you decide to apply a free-lanced - patch to your 3.2 code, you are on your own. In our own patches, we will - assume that your code is synchronized with ours. - - -- Good luck, and happy Hacking -- --- 0 ---- diff -Nacrd ../slashem-0.0.6E0F3+SE058/README.33 ./README.33 *** ../slashem-0.0.6E0F3+SE058/README.33 Thu Jan 1 01:00:00 1970 --- ./README.33 Fri Apr 7 18:44:13 2000 *************** *** 0 **** --- 1,184 ---- + NetHack 3.3 -- General information + + NetHack 3.3 is a new enhancement to the dungeon exploration game NetHack. + It is a distant descendent of Rogue and Hack, and a direct descendent of + NetHack 3.2. + + Here is a brief overview of new additions and changes in the game. + To give more would be cheating, wouldn't it? + + o Many, many bug fixes and minor tweaks + o Incorporate the wizard patch by Larry Stewart Zebra and Warwick Allison + o Split the character's race from his/her/its role in life + o Add elf, dwarf, orc, and gnome races + o Add new Ranger role + + + + - - - - - - - - - - - + + Please read items (1), (2) and (3) BEFORE doing anything with your new code. + + 1. Unpack the code in a dedicated new directory. We will refer to that + directory as the 'Top' directory. It makes no difference what you + call it. + + 2. If there is no flaw in the packaging, many sub-directories will be + automatically created, and files will be deposited in them: + + a. A 'dat' directory, which contains a variety of data files. + b. A 'doc' directory, which contains various documentation. + c. An 'include' directory, which contains *.h files. + d. A 'src' directory, which contains game *.c files used by all versions. + e. A 'util' directory, which contains files for utility programs. + f. A 'sys' directory, which contains subdirectories for files that + are operating-system specific. + g. A 'sys/share' subdirectory, which contains files shared by some OSs. + h. A 'sys/share/sounds' subsubdirectory, which contains sound files + shared by some OSs. + i. A 'sys/amiga' subdirectory, which contains files specific to AmigaDOS. + j. A 'sys/amiga/splitter' subsubdirectory, which contains files + for the Amiga splitter program. + k. A 'sys/atari' subdirectory, which contains files specific to TOS. + l. A 'sys/be' subdirectory, which contains files specific to Be OS. + m. A 'sys/mac' subdirectory, which contains files specific to MacOS. + n. A 'sys/mac/old' subdirectory which contains files used by + compilers that haven't been tested/used in a while. + o. A 'sys/msdos' subdirectory, which contains files specific to MS-DOS. + p. A 'sys/msdos/old' subsubdirectory, which contains files for old + MS-DOS compilers (no longer officially supported). + q. A 'sys/os2' subdirectory, which contains files specific to OS/2. + r. A 'sys/unix' subdirectory, which contains files specific to UNIX. + s. A 'sys/vms' subdirectory, which contains files specific to VMS. + t. A 'sys/winnt' subdirectory, which contains files specific to Windows NT. + u. A 'win' directory, which contains subdirectories for files that + are windowing-system specific (but not operating-system specific). + v. A 'win/share' subdirectory, which contains files shared by some + windowing systems. + w. A 'win/Qt' subdirectory, which contains files specific to Qt. + x. A 'win/X11' subdirectory, which contains files specific to X11. + y. A 'win/tty' subdirectory, which contains files specific to ttys. + z. A 'win/win32' subdirectory, which contains files specific to the + Windows NT Win32 API. + + The names of these directories should not be changed unless you are + ready to go through the makefiles and the makedefs program and change + all the directory references in them. + + 3. Having unpacked, you should have a file called 'Files' in your Top + directory. This file contains the list of all the files you now SHOULD + have in each directory. Please check the files in each directory + against this list to make sure that you have a complete set. + + 4. Before you do anything else, please read carefully the file called + "license" in the 'dat' subdirectory. It is expected that you comply + with the terms of that license, and we are very serious about it. + + 5. If everything is in order, you can now turn to trying to get the program + to compile and run on your particular system. It is worth mentioning + that the default configuration is SysV/Sun/Solaris2.x (simply because + the code was housed on such a system). It is also worth mentioning + here that NetHack 3.3 is a huge program. If you intend to run it on a + small machine, you'll have to make hard choices among the options + available in config.h. + + The files sys/*/Install.* were written to guide you in configuring the + program for your operating system. The files win/*/Install.* are + available, where necessary, to help you in configuring the program + for particular windowing environments. Reading them, and the man pages, + should answer most of your questions. + + At the time of this release, NetHack 3.3 is known to run/compile on: + + Apple Macintosh running MacOS 7.5 or higher, LinuxPPC, BeOS 4.0 + DEC Alpha/VMS (aka OpenVMS AXP), running V1.x through V7.0 + DEC VAX/VMS, running V4.6 through V7.0 + HP 9000s700 running HP-UX 10.x, 11.x + IBM PC compatibles running MS-DOS with Microsoft C, Borland C++ 3.1, or + DJGPP. It is recommended to have at least an 80386 processor. + IBM PS/2 and AT compatibles running OS/2 - 2.0 and up with GCC emx + Intel 80386 or greater (or clone) and DEC Alpha desktop machines + running Windows NT + Intel 80386 or greater (or clone) boxes running Linux, BSDI, or + Windows 95,98 + Intel Pentium or better (or clone) running BeOS 4.5 + Sun SPARC based machine running SunOS 4.x, Solaris 2.x, or Solaris 7 + + Previous versions of NetHack were tested on the following systems, + and we expect that NetHack 3.3 will work on them as well: + + Atari ST/TT/Falcon running TOS (or MultiTOS) with GCC + AT&T 3B1 running System V (3.51) + AT&T 3B2/600 & 3B2/622 running System V R3.2.1 + AT&T 3B2/1000 Model 80 running System V R3.2.2 + AT&T 3B4000 running System V + AT&T 6386 running System V R3.2 + Commodore Amiga running AmigaDOS 1.3 or greater with SAS/C 6.55 + (but see Install.ami about DICE and Manx) + Data General AViiON systems running DG/UX + DEC vaxen running BSD, Ultrix + Decstations running Ultrix 3.1, 4.x + Encore Multimax running UMAX 4.2 + Gould NP1 running UTX 3/2 + HP 9000s300 running HP-UX + HP 9000s700 running HP-UX 9.x + IBM PC/RT and RS/6000 running AIX 3.x + IBM PS/2 and AT compatibles running OS/2 1.1 - 2.0 (and probably + Warp) with Microsoft 6.0, and OS/2 2.0 and up with IBM CSet++ 2.0. + Intel 80386 or greater (or clone) running 386BSD + Mips M2000 running RiscOS 4.1 + NeXT running Mach (using BSD configuration) + Pyramid 9820x running OSx 4.4c + SGI Iris running IRIX + Stardent Vistra 800 running SysV R4.0 + Stride 460 running UniStride 2.1 + Sun-3s, -4s, and -386is running SunOS 3.x + Sun-3s and -386is running SunOS 4.x + Valid Logic Systems SCALD-System + + Unless otherwise mentioned, the compiler used was the OS-vendor's + C compiler. + + The Atari and Amiga ports have fallen into the unsupported category + due to a lack of people with machines and time. + + Support for Intel 80286 machines and DOS "real mode" versions has been + suspended. Builds have not been attempted in quite a while. The + overlay mechanism is still present in the code if someone wishes to + attempt to make it work. + + - - - - - - - - - - - + + If you have problems building the game, or you find bugs in it, the + development team may be reached at + + nethack-bugs@nethack.org + + Please be sure to include your machine type, OS, and patchlevel. + Alternatively, please fill out the bug report form on our web + page at www.nethack.org. + + Patches especially should be directed to this address. If you've changed + something to get NetHack to run on your system, it's likely that others have + done it by making slightly different modifications. By routing your patches + through the development team, we should be able to avoid making everyone else + choose among variant patches claiming to do the same thing, to keep most of + the copies of 3.3 synchronized by means of official patches, and to maintain + the painfully-created file organization. (This process has been working since + the time when everyone just posted their own patches to 2.3. At that time, + there were no archived bug-fixes to give to people who got 2.3 after its initial + release, so the same bugs kept being discovered by new batches of people.) + We have been successful in preventing this from happening since the 3.0 + release. Please cooperate to keep this from happening to 3.3. + + It is inevitable that we will reject some proposed additions of new features + either because they do not fit our conception of the game, or because they + require more code than we consider they're worth. If we reject your feature, + you are free, of course, to post the patches to the net yourself and let the + marketplace decide their worth. + + All of this amounts to the following: If you decide to apply a free-lanced + patch to your 3.3 code, you are on your own. In our own patches, we will + assume that your code is synchronized with ours. + + -- Good luck, and happy Hacking -- diff -Nacrd ../slashem-0.0.6E0F3+SE058/include/attk.h ./include/attk.h *** ../slashem-0.0.6E0F3+SE058/include/attk.h Fri Apr 7 18:43:09 2000 --- ./include/attk.h Fri Apr 7 18:44:13 2000 *************** *** 82,88 **** #define AT_TRAP 69 /* Trap (amon is null) */ #define AT_GODS 70 /* God (amon is null) */ ! /*#define AT_MAGC 66 /* uses magic spell(s) */ /* Add new damage types below. --- 82,88 ---- #define AT_TRAP 69 /* Trap (amon is null) */ #define AT_GODS 70 /* God (amon is null) */ ! /*#define AT_MAGC 66 */ /* uses magic spell(s) */ /* Add new damage types below. diff -Nacrd ../slashem-0.0.6E0F3+SE058/include/config.h ./include/config.h *** ../slashem-0.0.6E0F3+SE058/include/config.h Fri Apr 7 18:43:51 2000 --- ./include/config.h Fri Apr 7 18:45:21 2000 *************** *** 46,56 **** * Define all of those you want supported in your binary. * Some combinations make no sense. See the installation document. */ ! #define TTY_GRAPHICS /* good old tty based graphics */ ! /* #define X11_GRAPHICS /* X11 interface */ ! /* #define QT_GRAPHICS /* Qt Interface */ ! /* #define KDE /* KDE Interface */ ! /* #define GTK_GRAPHICS /* GTK Interface */ /* --- 46,56 ---- * Define all of those you want supported in your binary. * Some combinations make no sense. See the installation document. */ ! #define TTY_GRAPHICS /* good old tty based graphics */ ! /* #define X11_GRAPHICS */ /* X11 interface */ ! /* #define QT_GRAPHICS */ /* Qt Interface */ ! /* #define KDE */ /* KDE Interface */ ! /* #define GTK_GRAPHICS */ /* GTK Interface */ /* *************** *** 73,79 **** # define DEFAULT_WINDOW_SYS "amii" /* "amii", "amitile" or "tty" */ #endif ! #if 0 /* Removed in 3.3.0 /* Windows NT supports TTY_GRAPHICS */ #ifdef WIN32 # define DEFAULT_WINDOW_SYS "tty" --- 73,79 ---- # define DEFAULT_WINDOW_SYS "amii" /* "amii", "amitile" or "tty" */ #endif ! #if 0 /* Removed in 3.3.0 */ /* Windows NT supports TTY_GRAPHICS */ #ifdef WIN32 # define DEFAULT_WINDOW_SYS "tty" *************** *** 117,123 **** * xpmtoppm x11tiles_big.xpm */ ! /* # define USE_XPM /* Disable if you do not have the XPM library */ # ifdef USE_XPM # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */ # endif --- 117,123 ---- * xpmtoppm x11tiles_big.xpm */ ! /* # define USE_XPM */ /* Disable if you do not have the XPM library */ # ifdef USE_XPM # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */ # endif *************** *** 163,170 **** # define COMPRESS_EXTENSION ".Z" /* compress's extension */ /* An example of one alternative you might want to use: */ ! /* # define COMPRESS "/usr/local/bin/gzip" /* FSF gzip compression */ ! /* # define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ #endif #ifndef COMPRESS # define INTERNAL_COMP /* control use of NetHack's compression routines */ --- 163,170 ---- # define COMPRESS_EXTENSION ".Z" /* compress's extension */ /* An example of one alternative you might want to use: */ ! /* # define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */ ! /* # define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */ #endif #ifndef COMPRESS # define INTERNAL_COMP /* control use of NetHack's compression routines */ *************** *** 175,181 **** * a tar-like file, thus making a neater installation. See *conf.h * for detailed configuration. */ ! /* #define DLB /* not supported on all platforms */ /* * Defining INSURANCE slows down level changes, but allows games that --- 175,181 ---- * a tar-like file, thus making a neater installation. See *conf.h * for detailed configuration. */ ! /* #define DLB */ /* not supported on all platforms */ /* * Defining INSURANCE slows down level changes, but allows games that *************** *** 204,210 **** * since the user might create files in a directory of his choice. * Of course SECURE is meaningful only if HACKDIR is defined. */ ! /* #define SECURE /* do setuid(getuid()) after chdir() */ /* * If it is desirable to limit the number of people that can play Hack --- 204,210 ---- * since the user might create files in a directory of his choice. * Of course SECURE is meaningful only if HACKDIR is defined. */ ! /* #define SECURE */ /* do setuid(getuid()) after chdir() */ /* * If it is desirable to limit the number of people that can play Hack *************** *** 226,239 **** * 'void' type (and thus would give all sorts of compile errors without * this definition). */ ! /* #define NOVOID /* define if no "void" data type. */ /* * Uncomment the following line if your compiler falsely claims to be * a standard C compiler (i.e., defines __STDC__ without cause). * Examples are Apollo's cc (in some versions) and possibly SCO UNIX's rcc. */ ! /* #define NOTSTDC /* define for lying compilers */ #include "tradstdc.h" --- 226,239 ---- * 'void' type (and thus would give all sorts of compile errors without * this definition). */ ! /* #define NOVOID */ /* define if no "void" data type. */ /* * Uncomment the following line if your compiler falsely claims to be * a standard C compiler (i.e., defines __STDC__ without cause). * Examples are Apollo's cc (in some versions) and possibly SCO UNIX's rcc. */ ! /* #define NOTSTDC */ /* define for lying compilers */ #include "tradstdc.h" *************** *** 275,281 **** */ #define BITFIELDS /* Good bitfield handling */ ! /* #define STRNCMPI /* compiler/library has the strncmpi function */ /* * There are various choices for the NetHack vision system. There is a --- 275,281 ---- */ #define BITFIELDS /* Good bitfield handling */ ! /* #define STRNCMPI */ /* compiler/library has the strncmpi function */ /* * There are various choices for the NetHack vision system. There is a *************** *** 290,296 **** * functions that have been macroized. */ /* WAC Can be defined under DJGPP, even though it's DOS*/ ! /*#define VISION_TABLES /* use vision tables generated at compile time */ #ifndef VISION_TABLES # ifndef NO_MACRO_CPATH # define MACRO_CPATH /* use clear_path macros instead of functions */ --- 290,296 ---- * functions that have been macroized. */ /* WAC Can be defined under DJGPP, even though it's DOS*/ ! /*#define VISION_TABLES */ /* use vision tables generated at compile time */ #ifndef VISION_TABLES # ifndef NO_MACRO_CPATH # define MACRO_CPATH /* use clear_path macros instead of functions */ *************** *** 331,337 **** #define DWARF /* Dwarf Patch, Osku Salerma (osku@iki.fi) */ #define TOURIST /* Tourist players with cameras and Hawaiian shirts */ #define YEOMAN /* KMH -- Yeoman class */ ! /*#define ZOUTHERN /* KMH -- Zoutherner class and its animals */ /* I/O */ #define REDO /* support for redoing last command - DGK */ --- 331,337 ---- #define DWARF /* Dwarf Patch, Osku Salerma (osku@iki.fi) */ #define TOURIST /* Tourist players with cameras and Hawaiian shirts */ #define YEOMAN /* KMH -- Yeoman class */ ! /* #define ZOUTHERN */ /* KMH -- Zoutherner class and its animals */ /* I/O */ #define REDO /* support for redoing last command - DGK */ *************** *** 341,347 **** /* difficulty */ #define ELBERETH /* Engraving the E-word repels monsters */ ! /*#define NOARTIFACTWISH /* No wishing for special artifacts -- swhite@cs.mun.ca */ /* The following are best left disabled until their bugs are completely fixed */ --- 341,347 ---- /* difficulty */ #define ELBERETH /* Engraving the E-word repels monsters */ ! /* #define NOARTIFACTWISH */ /* No wishing for special artifacts -- swhite@cs.mun.ca */ /* The following are best left disabled until their bugs are completely fixed */ *************** *** 360,366 **** * * SOUNDDIR= */ ! /* #define USER_SOUNDS /* Allow user-defined regex mappings from messages to sounds */ /* Only supported on Qt with NAS - Network Audio System */ --- 360,366 ---- * * SOUNDDIR= */ ! /* #define USER_SOUNDS */ /* Allow user-defined regex mappings from messages to sounds */ /* Only supported on Qt with NAS - Network Audio System */ *************** *** 369,378 **** #endif #define EXP_ON_BOTL /* Show experience on bottom line */ ! /* #define SCORE_ON_BOTL /* added by Gary Erickson (erickson@ucivax) */ ! /* #define BORG /* Works only under DOS */ ! /* #define KEEP_SAVE /* Keep savefiles after Restore (wac@intergate.bc.ca)*/ ! /*#define CHARON /* Charon's boat, enables Cerebus */ #define SHOW_DMG /* WAC made dmg reports optional (wac@intergate.bc.ca)*/ #define SHOW_WEIGHT /* [max] added display of object weight when picking up */ /* and in inventory (madmax@fly.cc.fer.hr). */ --- 369,378 ---- #endif #define EXP_ON_BOTL /* Show experience on bottom line */ ! /* #define SCORE_ON_BOTL */ /* added by Gary Erickson (erickson@ucivax) */ ! /* #define BORG */ /* Works only under DOS */ ! /* #define KEEP_SAVE */ /* Keep savefiles after Restore (wac@intergate.bc.ca)*/ ! /*#define CHARON */ /* Charon's boat, enables Cerebus */ #define SHOW_DMG /* WAC made dmg reports optional (wac@intergate.bc.ca)*/ #define SHOW_WEIGHT /* [max] added display of object weight when picking up */ /* and in inventory (madmax@fly.cc.fer.hr). */ diff -Nacrd ../slashem-0.0.6E0F3+SE058/include/extern.h ./include/extern.h *** ../slashem-0.0.6E0F3+SE058/include/extern.h Fri Apr 7 18:43:09 2000 --- ./include/extern.h Fri Apr 7 18:44:13 2000 *************** *** 1481,1487 **** E int NDECL(doremove); E int NDECL(dospinweb); E int NDECL(dosummon); ! /*E int NDECL(doconfuse); /* WAC handled by dogaze */ E int NDECL(dohide); E int NDECL(domindblast); E const char *FDECL(mbodypart, (struct monst *,int)); --- 1481,1489 ---- E int NDECL(doremove); E int NDECL(dospinweb); E int NDECL(dosummon); ! #if 0 ! E int NDECL(doconfuse); /* WAC handled by dogaze */ ! #endif E int NDECL(dohide); E int NDECL(domindblast); E const char *FDECL(mbodypart, (struct monst *,int)); diff -Nacrd ../slashem-0.0.6E0F3+SE058/include/ntconf.h ./include/ntconf.h *** ../slashem-0.0.6E0F3+SE058/include/ntconf.h Fri Apr 7 18:43:09 2000 --- ./include/ntconf.h Fri Apr 7 18:44:13 2000 *************** *** 5,11 **** #ifndef NTCONF_H #define NTCONF_H ! /* #define SHELL /* nt use of pcsys routines caused a hang */ #define RANDOM /* have Berkeley random(3) */ --- 5,11 ---- #ifndef NTCONF_H #define NTCONF_H ! /* #define SHELL */ /* nt use of pcsys routines caused a hang */ #define RANDOM /* have Berkeley random(3) */ *************** *** 27,33 **** * The remaining code shouldn't need modification. * ----------------------------------------------------------------- */ ! /* #define SHORT_FILENAMES /* All NT filesystems support long names now */ #define MICRO /* always define this! */ #define NO_TERMS --- 27,33 ---- * The remaining code shouldn't need modification. * ----------------------------------------------------------------- */ ! /* #define SHORT_FILENAMES */ /* All NT filesystems support long names now */ #define MICRO /* always define this! */ #define NO_TERMS diff -Nacrd ../slashem-0.0.6E0F3+SE058/include/os2conf.h ./include/os2conf.h *** ../slashem-0.0.6E0F3+SE058/include/os2conf.h Fri Apr 7 18:43:09 2000 --- ./include/os2conf.h Fri Apr 7 18:44:13 2000 *************** *** 12,29 **** * selected either here or in Makefile.os2. */ ! /* #define OS2_MSC /* Microsoft C 5.1 and 6.0 */ ! /* #define OS2_GCC /* GCC emx 0.8f */ ! /* #define OS2_CSET2 /* IBM C Set/2 (courtesy Jeff Urlwin) */ ! /* #define OS2_CSET2_VER_1 /* CSet/2 version selection */ ! /* #define OS2_CSET2_VER_2 /* - " - */ /* * System configuration. */ #define OS2_USESYSHEADERS /* use compiler's own system headers */ ! /* #define OS2_HPFS /* use OS/2 High Performance File System */ #if defined(OS2_GCC) || defined(OS2_CSET2) # define OS2_32BITAPI /* enable for compilation in OS/2 2.0 */ --- 12,29 ---- * selected either here or in Makefile.os2. */ ! /* #define OS2_MSC */ /* Microsoft C 5.1 and 6.0 */ ! /* #define OS2_GCC */ /* GCC emx 0.8f */ ! /* #define OS2_CSET2 */ /* IBM C Set/2 (courtesy Jeff Urlwin) */ ! /* #define OS2_CSET2_VER_1 */ /* CSet/2 version selection */ ! /* #define OS2_CSET2_VER_2 */ /* - " - */ /* * System configuration. */ #define OS2_USESYSHEADERS /* use compiler's own system headers */ ! /* #define OS2_HPFS */ /* use OS/2 High Performance File System */ #if defined(OS2_GCC) || defined(OS2_CSET2) # define OS2_32BITAPI /* enable for compilation in OS/2 2.0 */ *************** *** 37,43 **** #define MFLOPPY /* floppy and ramdisk support */ #define RANDOM /* Berkeley random(3) */ #define SHELL /* shell escape */ ! /* #define TERMLIB /* use termcap file */ #define ANSI_DEFAULT /* allows NetHack to run without termcap file */ #define TEXTCOLOR /* allow color */ --- 37,43 ---- #define MFLOPPY /* floppy and ramdisk support */ #define RANDOM /* Berkeley random(3) */ #define SHELL /* shell escape */ ! /* #define TERMLIB */ /* use termcap file */ #define ANSI_DEFAULT /* allows NetHack to run without termcap file */ #define TEXTCOLOR /* allow color */ diff -Nacrd ../slashem-0.0.6E0F3+SE058/include/pcconf.h ./include/pcconf.h *** ../slashem-0.0.6E0F3+SE058/include/pcconf.h Fri Apr 7 18:43:09 2000 --- ./include/pcconf.h Fri Apr 7 18:44:13 2000 *************** *** 29,44 **** * For pre-V7.0 Microsoft Compilers only, manually define OVERLAY here. */ ! /*#define OVERLAY /* Manual overlay definition (MSC 6.0ax only) */ # ifndef __GO32__ # define MFLOPPY /* Support for floppy drives and ramdisks by dgk */ # endif /* [Tom] trying to make this work with WATCOM */ ! /* # define NO_SIGNAL ! /* # undef MOVERLAY ! */ # define SHELL /* via exec of COMMAND.COM */ --- 29,45 ---- * For pre-V7.0 Microsoft Compilers only, manually define OVERLAY here. */ ! /* #define OVERLAY */ /* Manual overlay definition (MSC 6.0ax only) */ # ifndef __GO32__ # define MFLOPPY /* Support for floppy drives and ramdisks by dgk */ # endif /* [Tom] trying to make this work with WATCOM */ ! #if 0 ! # define NO_SIGNAL ! # undef MOVERLAY ! #endif # define SHELL /* via exec of COMMAND.COM */ *************** *** 56,78 **** * or NO_TERMS */ ! /* # define TERMLIB /* enable use of termcap file /etc/termcap */ /* or ./termcap for MSDOS (SAC) */ /* compile and link in Fred Fish's termcap library, */ /* enclosed in TERMCAP.ARC, to use this */ ! /* # define ANSI_DEFAULT /* allows NetHack to run without a ./termcap */ # define NO_TERMS /* Allows Nethack to run without ansi.sys by linking */ /* screen routines into the .exe */ # ifdef NO_TERMS /* if NO_TERMS select one screen package below */ #define SCREEN_BIOS /* Use bios calls for all screen control */ ! /* #define SCREEN_DJGPPFAST /* Use djgpp fast screen routines */ # endif ! /* # define PC9800 /* Allows NetHack to run on NEC PC-9800 machines */ /* Yamamoto Keizo */ --- 57,79 ---- * or NO_TERMS */ ! /* # define TERMLIB */ /* enable use of termcap file /etc/termcap */ /* or ./termcap for MSDOS (SAC) */ /* compile and link in Fred Fish's termcap library, */ /* enclosed in TERMCAP.ARC, to use this */ ! /* # define ANSI_DEFAULT */ /* allows NetHack to run without a ./termcap */ # define NO_TERMS /* Allows Nethack to run without ansi.sys by linking */ /* screen routines into the .exe */ # ifdef NO_TERMS /* if NO_TERMS select one screen package below */ #define SCREEN_BIOS /* Use bios calls for all screen control */ ! /* #define SCREEN_DJGPPFAST */ /* Use djgpp fast screen routines */ # endif ! /* # define PC9800 */ /* Allows NetHack to run on NEC PC-9800 machines */ /* Yamamoto Keizo */ *************** *** 104,110 **** /* amiconf.h). In the future this will be the */ /* hook for mail reader implementation. */ ! /*# define PC_LOCKING /* Allow confirmation before overwriting game */ /* that is in progress or aborted when another */ /* game is started with the same player name. */ --- 105,111 ---- /* amiconf.h). In the future this will be the */ /* hook for mail reader implementation. */ ! /* # define PC_LOCKING */ /* Allow confirmation before overwriting game */ /* that is in progress or aborted when another */ /* game is started with the same player name. */ diff -Nacrd ../slashem-0.0.6E0F3+SE058/include/skills.h ./include/skills.h *** ../slashem-0.0.6E0F3+SE058/include/skills.h Fri Apr 7 18:43:51 2000 --- ./include/skills.h Fri Apr 7 18:44:13 2000 *************** *** 68,74 **** /* Other types of combat */ #define P_BARE_HANDED_COMBAT (P_LAST_SPELL + 1) #define P_MARTIAL_ARTS (P_LAST_SPELL + 2) /* WAC used to be role distinguishes */ ! /* #define P_WRESTLING ??? /* Hey -- maybe someone might add it in for me =) */ #define P_FIRST_H_TO_H P_BARE_HANDED_COMBAT #define P_LAST_H_TO_H P_MARTIAL_ARTS --- 68,74 ---- /* Other types of combat */ #define P_BARE_HANDED_COMBAT (P_LAST_SPELL + 1) #define P_MARTIAL_ARTS (P_LAST_SPELL + 2) /* WAC used to be role distinguishes */ ! /* #define P_WRESTLING ??? */ /* Hey -- maybe someone might add it in for me =) */ #define P_FIRST_H_TO_H P_BARE_HANDED_COMBAT #define P_LAST_H_TO_H P_MARTIAL_ARTS diff -Nacrd ../slashem-0.0.6E0F3+SE058/include/tosconf.h ./include/tosconf.h *** ../slashem-0.0.6E0F3+SE058/include/tosconf.h Fri Apr 7 18:43:09 2000 --- ./include/tosconf.h Fri Apr 7 18:44:13 2000 *************** *** 13,20 **** GNU C with the MiNT library. */ ! /*#define NO_SIGNAL /* library doesn't support signals */ ! /*#define NO_FSTAT /* library doesn't have fstat() call */ #define MINT /* library supports MiNT extensions to TOS */ #ifdef __MINT__ --- 13,20 ---- GNU C with the MiNT library. */ ! /* #define NO_SIGNAL */ /* library doesn't support signals */ ! /* #define NO_FSTAT */ /* library doesn't have fstat() call */ #define MINT /* library supports MiNT extensions to TOS */ #ifdef __MINT__ diff -Nacrd ../slashem-0.0.6E0F3+SE058/include/unixconf.h ./include/unixconf.h *** ../slashem-0.0.6E0F3+SE058/include/unixconf.h Fri Apr 7 18:43:09 2000 --- ./include/unixconf.h Fri Apr 7 18:44:13 2000 *************** *** 111,117 **** * FILE_AREA_DOC For human-readable documentation */ ! /* #define FILE_AREAS /* Use file areas */ #ifdef FILE_AREAS --- 111,117 ---- * FILE_AREA_DOC For human-readable documentation */ ! /* #define FILE_AREAS */ /* Use file areas */ #ifdef FILE_AREAS *************** *** 121,141 **** * many systems still seem to use it. */ ! /* #define FILE_AREA_VAR "/var/lib/games/slashem/" /* */ ! /* #define FILE_AREA_SAVE "/var/lib/games/slashem/save/" /* */ ! /* #define FILE_AREA_SHARE "/usr/lib/games/slashem/" /* */ ! /* #define FILE_AREA_UNSHARE "/usr/lib/games/slashem/" /* */ ! /* #define FILE_AREA_DOC "/usr/doc/slashem/" /* */ /* * File areas compatible with FHS 2.0 */ ! #define FILE_AREA_VAR "/var/games/slashem/" /* */ ! #define FILE_AREA_SAVE "/var/games/slashem/save/" /* */ ! #define FILE_AREA_SHARE "/usr/share/games/slashem/" /* */ ! #define FILE_AREA_UNSHARE "/usr/lib/games/slashem/" /* */ ! #define FILE_AREA_DOC "/usr/share/doc/slashem/" /* */ #define FILE_AREA_BONES FILE_AREA_VAR #define FILE_AREA_LEVL FILE_AREA_VAR --- 121,141 ---- * many systems still seem to use it. */ ! /* #define FILE_AREA_VAR "/var/lib/games/slashem/" */ ! /* #define FILE_AREA_SAVE "/var/lib/games/slashem/save/" */ ! /* #define FILE_AREA_SHARE "/usr/lib/games/slashem/" */ ! /* #define FILE_AREA_UNSHARE "/usr/lib/games/slashem/" */ ! /* #define FILE_AREA_DOC "/usr/doc/slashem/" */ /* * File areas compatible with FHS 2.0 */ ! #define FILE_AREA_VAR "/var/games/slashem/" ! #define FILE_AREA_SAVE "/var/games/slashem/save/" ! #define FILE_AREA_SHARE "/usr/share/games/slashem/" ! #define FILE_AREA_UNSHARE "/usr/lib/games/slashem/" ! #define FILE_AREA_DOC "/usr/share/doc/slashem/" #define FILE_AREA_BONES FILE_AREA_VAR #define FILE_AREA_LEVL FILE_AREA_VAR *************** *** 150,156 **** * Ralf Brown, 7/26/89 (from v2.3 hack of 10/10/88) */ ! /* #define NO_FILE_LINKS /* if no hard links */ #ifdef NO_FILE_LINKS # ifdef FILE_AREAS --- 150,156 ---- * Ralf Brown, 7/26/89 (from v2.3 hack of 10/10/88) */ ! /* #define NO_FILE_LINKS */ /* if no hard links */ #ifdef NO_FILE_LINKS # ifdef FILE_AREAS diff -Nacrd ../slashem-0.0.6E0F3+SE058/include/vmsconf.h ./include/vmsconf.h *** ../slashem-0.0.6E0F3+SE058/include/vmsconf.h Fri Apr 7 18:43:09 2000 --- ./include/vmsconf.h Fri Apr 7 18:44:13 2000 *************** *** 237,243 **** #define getuid() vms_getuid() /* vmsunix.c */ #define link(f1,f2) vms_link(f1,f2) /* vmsfiles.c */ #define open(f,k,m) vms_open(f,k,m) /* vmsfiles.c */ ! /* #define unlink(f0) vms_unlink(f0) /* vmsfiles.c */ #ifdef VERYOLD_VMS #define unlink(f0) delete(f0) /* vaxcrtl */ #else --- 237,245 ---- #define getuid() vms_getuid() /* vmsunix.c */ #define link(f1,f2) vms_link(f1,f2) /* vmsfiles.c */ #define open(f,k,m) vms_open(f,k,m) /* vmsfiles.c */ ! #if 0 ! #define unlink(f0) vms_unlink(f0) /* vmsfiles.c */ ! #endif #ifdef VERYOLD_VMS #define unlink(f0) delete(f0) /* vaxcrtl */ #else diff -Nacrd ../slashem-0.0.6E0F3+SE058/include/you.h ./include/you.h *** ../slashem-0.0.6E0F3+SE058/include/you.h Fri Apr 7 18:43:51 2000 --- ./include/you.h Fri Apr 7 18:44:13 2000 *************** *** 354,362 **** #ifdef NOARTIFACTWISH int usacrifice; /* number of sacrifices so far */ #endif /* KMH -- Drow is now its own role... */ ! /* boolean uelf_drow; /* are you a drow? */ ! /* int ustrucklast; /* Seems unused */ long ugold, ugold0; long uexp, urexp; long ucleansed; /* to record moves when player was cleansed */ --- 354,364 ---- #ifdef NOARTIFACTWISH int usacrifice; /* number of sacrifices so far */ #endif + #if 0 /* KMH -- Drow is now its own role... */ ! boolean uelf_drow; /* are you a drow? */ ! int ustrucklast; /* Seems unused */ ! #endif long ugold, ugold0; long uexp, urexp; long ucleansed; /* to record moves when player was cleansed */ diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/attrib.c ./src/attrib.c *** ../slashem-0.0.6E0F3+SE058/src/attrib.c Fri Apr 7 18:43:09 2000 --- ./src/attrib.c Fri Apr 7 18:44:13 2000 *************** *** 63,72 **** { 5, &(HStealth), "stealthy", "" }, { 7, &(HWarning), "sensitive", "" }, { 9, &(HSearching), "perceptive", "unaware" }, ! /* { 11, &(HFire_resistance), "cool", "warmer" }, { 13, &(HCold_resistance), "warm", "cooler" }, { 15, &(HShock_resistance), "insulated", "conductive" }, /* WAC -- made the above three attribs techs */ { 17, &(HTeleport_control), "controlled","uncontrolled" }, { 0, 0, 0, 0 } }, --- 63,74 ---- { 5, &(HStealth), "stealthy", "" }, { 7, &(HWarning), "sensitive", "" }, { 9, &(HSearching), "perceptive", "unaware" }, ! #if 0 ! { 11, &(HFire_resistance), "cool", "warmer" }, { 13, &(HCold_resistance), "warm", "cooler" }, { 15, &(HShock_resistance), "insulated", "conductive" }, /* WAC -- made the above three attribs techs */ + #endif { 17, &(HTeleport_control), "controlled","uncontrolled" }, { 0, 0, 0, 0 } }, diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/botl.c ./src/botl.c *** ../slashem-0.0.6E0F3+SE058/src/botl.c Fri Apr 7 18:43:09 2000 --- ./src/botl.c Fri Apr 7 18:44:13 2000 *************** *** 302,308 **** /* WAC -- Shorten bot1 to fit in len spaces. * Currently only used by wintty * Longest string past Str: is ! * ". Str:18/** Dx:11 Co:13 In:12 Wi:14 Ch:14 Neutral" or 49 Chars long. */ #ifdef TTY_GRAPHICS const char* --- 302,308 ---- /* WAC -- Shorten bot1 to fit in len spaces. * Currently only used by wintty * Longest string past Str: is ! * ". Str:18/99 Dx:11 Co:13 In:12 Wi:14 Ch:14 Neutral" or 49 Chars long. */ #ifdef TTY_GRAPHICS const char* diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/cmd.c ./src/cmd.c *** ../slashem-0.0.6E0F3+SE058/src/cmd.c Fri Apr 7 18:43:51 2000 --- ./src/cmd.c Fri Apr 7 18:44:13 2000 *************** *** 114,120 **** #endif STATIC_PTR int NDECL(domonability); STATIC_PTR int NDECL(playersteal); ! /* STATIC_PTR int NDECL(specialpower); /* WAC -- use techniques */ # ifdef WIZARD STATIC_PTR int NDECL(wiz_wish); STATIC_PTR int NDECL(wiz_identify); --- 114,122 ---- #endif STATIC_PTR int NDECL(domonability); STATIC_PTR int NDECL(playersteal); ! #if 0 ! STATIC_PTR int NDECL(specialpower); /* WAC -- use techniques */ ! #endif # ifdef WIZARD STATIC_PTR int NDECL(wiz_wish); STATIC_PTR int NDECL(wiz_identify); *************** *** 474,480 **** if (can_breathe(youmonst.data)) return dobreathe(); else if (attacktype(youmonst.data, AT_SPIT)) return dospit(); else if (youmonst.data->mlet == S_NYMPH) return doremove(); ! /* else if (youmonst.data->mlet == S_UMBER) return doconfuse(); /* WAC handled by dogaze */ else if (attacktype(youmonst.data, AT_GAZE)) return dogaze(); /* WAC */ else if (is_were(youmonst.data)) return dosummon(); else if (webmaker(youmonst.data)) return dospinweb(); --- 476,484 ---- if (can_breathe(youmonst.data)) return dobreathe(); else if (attacktype(youmonst.data, AT_SPIT)) return dospit(); else if (youmonst.data->mlet == S_NYMPH) return doremove(); ! #if 0 ! else if (youmonst.data->mlet == S_UMBER) return doconfuse(); /* WAC handled by dogaze */ ! #endif else if (attacktype(youmonst.data, AT_GAZE)) return dogaze(); /* WAC */ else if (is_were(youmonst.data)) return dosummon(); else if (webmaker(youmonst.data)) return dospinweb(); *************** *** 1725,1731 **** {'B', TRUE, doborgtoggle}, /* [Tom] */ #endif {M('b'), FALSE, playersteal}, /* jla */ ! /* {M('b'), FALSE, specialpower}, /* jla */ {'c', FALSE, doclose}, {'C', TRUE, do_mname}, {M('c'), TRUE, dotalk}, --- 1729,1737 ---- {'B', TRUE, doborgtoggle}, /* [Tom] */ #endif {M('b'), FALSE, playersteal}, /* jla */ ! #if 0 ! {M('b'), FALSE, specialpower}, /* jla */ ! #endif {'c', FALSE, doclose}, {'C', TRUE, do_mname}, {M('c'), TRUE, dotalk}, *************** *** 1789,1795 **** {M('w'), FALSE, dowipe}, {'x', FALSE, doswapweapon}, /* [Tom] */ {'X', TRUE, enter_explore_mode}, ! /* {M('x'), TRUE, dovspell}, /* Mike Stephenson */ /* 'y', 'Y' : go nw */ {M('y'), FALSE, polyatwill}, /* jla */ {'z', FALSE, dozap}, --- 1795,1803 ---- {M('w'), FALSE, dowipe}, {'x', FALSE, doswapweapon}, /* [Tom] */ {'X', TRUE, enter_explore_mode}, ! #if 0 ! {M('x'), TRUE, dovspell}, /* Mike Stephenson */ ! #endif /* 'y', 'Y' : go nw */ {M('y'), FALSE, polyatwill}, /* jla */ {'z', FALSE, dozap}, diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/display.c ./src/display.c *** ../slashem-0.0.6E0F3+SE058/src/display.c Fri Apr 7 18:43:09 2000 --- ./src/display.c Fri Apr 7 18:44:13 2000 *************** *** 1496,1503 **** * If an invisible monster has gone away, that will be discovered. If an * invisible monster has appeared, this will _not_ be discovered since * searching only finds one monster per turn so we must check that separately. ! ! /* Return a wall mode for a corner wall. (x4,y4) is the "inner" position. */ STATIC_OVL int set_corn(x1,y1, x2,y2, x3,y3, x4,y4) int x1, y1, x2, y2, x3, y3, x4, y4; --- 1496,1504 ---- * If an invisible monster has gone away, that will be discovered. If an * invisible monster has appeared, this will _not_ be discovered since * searching only finds one monster per turn so we must check that separately. ! * ! * Return a wall mode for a corner wall. (x4,y4) is the "inner" position. ! */ STATIC_OVL int set_corn(x1,y1, x2,y2, x3,y3, x4,y4) int x1, y1, x2, y2, x3, y3, x4, y4; diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/drawing.c ./src/drawing.c *** ../slashem-0.0.6E0F3+SE058/src/drawing.c Fri Apr 7 18:43:09 2000 --- ./src/drawing.c Fri Apr 7 18:44:13 2000 *************** *** 392,399 **** 0xfe, /* S_hodoor: meta-~, small centered square */ g_FILLER(S_vcdoor), g_FILLER(S_hcdoor), ! 240, /*g_FILLER(S_bars), equivalency, courtesy Sascha */ ! 241, /*g_FILLER(S_tree),*/ 0xfa, /* S_room: meta-z, centered dot */ /*20*/ 0xb0, /* S_corr: meta-0, light shading */ 0xb1, /* S_litcorr: meta-1, medium shading */ --- 392,399 ---- 0xfe, /* S_hodoor: meta-~, small centered square */ g_FILLER(S_vcdoor), g_FILLER(S_hcdoor), ! 240, /* S_bars: equivalency, courtesy Sascha */ ! 241, /* S_tree: plus or minus symbol */ 0xfa, /* S_room: meta-z, centered dot */ /*20*/ 0xb0, /* S_corr: meta-0, light shading */ 0xb1, /* S_litcorr: meta-1, medium shading */ *************** *** 401,408 **** g_FILLER(S_dnstair), g_FILLER(S_upladder), g_FILLER(S_dnladder), - g_FILLER(S_grave), g_FILLER(S_altar), g_FILLER(S_throne), g_FILLER(S_sink), /*30*/ g_FILLER(S_toilet), --- 401,408 ---- g_FILLER(S_dnstair), g_FILLER(S_upladder), g_FILLER(S_dnladder), g_FILLER(S_altar), + g_FILLER(S_grave), g_FILLER(S_throne), g_FILLER(S_sink), /*30*/ g_FILLER(S_toilet), *************** *** 547,563 **** 0xe1, /* S_hodoor: meta-a, solid block */ g_FILLER(S_vcdoor), g_FILLER(S_hcdoor), ! 252, /*g_FILLER(S_bars), small pi, courtesy Pat Rankin */ ! 231, /*g_FILLER(S_tree), plus-or-minus, courtesy Pat Rankin */ 0xfe, /* S_room: meta-~, centered dot */ /*20*/ g_FILLER(S_corr), g_FILLER(S_litcorr), g_FILLER(S_upstair), g_FILLER(S_dnstair), ! g_FILLER(S_upladder), ! g_FILLER(S_dnladder), ! g_FILLER(S_grave), g_FILLER(S_altar), /* 0xc3, \E)3: meta-C, dagger */ g_FILLER(S_throne), g_FILLER(S_sink), /*30*/ g_FILLER(S_toilet), --- 547,563 ---- 0xe1, /* S_hodoor: meta-a, solid block */ g_FILLER(S_vcdoor), g_FILLER(S_hcdoor), ! 0xfb, /* S_bars: meta-{, small pi, courtesy Pat Rankin */ ! 0xe7, /* S_tree: meta-g, plus-or-minus, courtesy Pat Rankin */ 0xfe, /* S_room: meta-~, centered dot */ /*20*/ g_FILLER(S_corr), g_FILLER(S_litcorr), g_FILLER(S_upstair), g_FILLER(S_dnstair), ! 0xf9, /* S_upladder: meta-y, greater-than-or-equals */ ! 0xfa, /* S_dnladder: meta-z, less-than-or-equals */ g_FILLER(S_altar), /* 0xc3, \E)3: meta-C, dagger */ + g_FILLER(S_grave), g_FILLER(S_throne), g_FILLER(S_sink), /*30*/ g_FILLER(S_toilet), *************** *** 702,709 **** 0xee, /* S_hodoor */ 0xef, /* S_vcdoor */ 0xef, /* S_hcdoor */ ! 0xf0, /*g_FILLER(S_bars),*/ ! 0xf1, /*g_FILLER(S_tree),*/ g_FILLER(S_Room), /*20*/ 0xB0, /* S_corr */ g_FILLER(S_litcorr), --- 702,709 ---- 0xee, /* S_hodoor */ 0xef, /* S_vcdoor */ 0xef, /* S_hcdoor */ ! 0xf0, /* S_bars: equivalency symbol */ ! 0xf1, /* S_tree: plus-or-minus */ g_FILLER(S_Room), /*20*/ 0xB0, /* S_corr */ g_FILLER(S_litcorr), *************** *** 712,718 **** g_FILLER(S_upladder), g_FILLER(S_dnladder), g_FILLER(S_altar), ! 0xef, /*g_FILLER(S_grave),*/ g_FILLER(S_throne), g_FILLER(S_sink), /*30*/ g_FILLER(S_toilet), --- 712,718 ---- g_FILLER(S_upladder), g_FILLER(S_dnladder), g_FILLER(S_altar), ! 0xef, /* S_grave: same as open door */ g_FILLER(S_throne), g_FILLER(S_sink), /*30*/ g_FILLER(S_toilet), diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/gypsy.c ./src/gypsy.c *** ../slashem-0.0.6E0F3+SE058/src/gypsy.c Fri Apr 7 18:43:09 2000 --- ./src/gypsy.c Fri Apr 7 18:44:13 2000 *************** *** 110,117 **** { "the Fool", /* This is NOT a Joker */ "the Magician", /* same as the Magus */ "the High Priestess", /* sometimes placed after the Emperor */ ! /* "the Empress", /* not included here */ ! /* "the Emperor", /* not included here */ "the Oracle", /* same as the Hierophant */ "the Lovers", "the Chariot", --- 110,119 ---- { "the Fool", /* This is NOT a Joker */ "the Magician", /* same as the Magus */ "the High Priestess", /* sometimes placed after the Emperor */ ! #if 0 ! "the Empress", /* not included here */ ! "the Emperor", /* not included here */ ! #endif "the Oracle", /* same as the Hierophant */ "the Lovers", "the Chariot", diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/light.c ./src/light.c *** ../slashem-0.0.6E0F3+SE058/src/light.c Fri Apr 7 18:43:09 2000 --- ./src/light.c Fri Apr 7 18:44:13 2000 *************** *** 55,61 **** static light_source *light_base = 0; ! /* static struct monst *FDECL(find_mid, (unsigned)); /* WAC No longer static */ STATIC_DCL void FDECL(write_ls, (int, light_source *)); STATIC_DCL int FDECL(maybe_write_ls, (int, int, BOOLEAN_P)); --- 55,63 ---- static light_source *light_base = 0; ! #if 0 ! static struct monst *FDECL(find_mid, (unsigned)); /* WAC No longer static */ ! #endif STATIC_DCL void FDECL(write_ls, (int, light_source *)); STATIC_DCL int FDECL(maybe_write_ls, (int, int, BOOLEAN_P)); diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/mcastu.c ./src/mcastu.c *** ../slashem-0.0.6E0F3+SE058/src/mcastu.c Fri Apr 7 18:43:09 2000 --- ./src/mcastu.c Fri Apr 7 18:44:13 2000 *************** *** 101,107 **** if (chance > 100) chance = 100; if (chance < 0) chance = 0; ! /* if(rn2(ml*10) < (mtmp->mconf ? 100 : 20)) { /* fumbled attack */ if (mtmp->mconf || rnd(100) > chance) { /* fumbled attack */ if (canseemon(mtmp) && flags.soundok) pline_The("air crackles around %s.", mon_nam(mtmp)); --- 101,109 ---- if (chance > 100) chance = 100; if (chance < 0) chance = 0; ! #if 0 ! if(rn2(ml*10) < (mtmp->mconf ? 100 : 20)) { /* fumbled attack */ ! #endif if (mtmp->mconf || rnd(100) > chance) { /* fumbled attack */ if (canseemon(mtmp) && flags.soundok) pline_The("air crackles around %s.", mon_nam(mtmp)); diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/mkmaze.c ./src/mkmaze.c *** ../slashem-0.0.6E0F3+SE058/src/mkmaze.c Fri Apr 7 18:43:09 2000 --- ./src/mkmaze.c Fri Apr 7 18:44:13 2000 *************** *** 1337,1343 **** /* WAC removed this. The ball and chain is moved * as a CONS_OBJECT by the bubble */ ! /* if (Punished) placebc(); /* do this for now */ break; } --- 1337,1345 ---- /* WAC removed this. The ball and chain is moved * as a CONS_OBJECT by the bubble */ ! #if 0 ! if (Punished) placebc(); /* do this for now */ ! #endif break; } diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/options.c ./src/options.c *** ../slashem-0.0.6E0F3+SE058/src/options.c Fri Apr 7 18:43:09 2000 --- ./src/options.c Fri Apr 7 18:44:13 2000 *************** *** 217,226 **** #ifdef MAC { "background", "the color of the background (black or white),", 6 }, #endif - { "badgername", "the name of your (first) badger (e.g., badgername:Jack)", - PL_PSIZ }, - { "batname", "the name of your (first) bat (e.g., batname:Drake)", - PL_PSIZ }, { "catname", "the name of your (first) cat (e.g., catname:Tabby)", PL_PSIZ }, { "disclose", "the kinds of information to disclose at end of game", --- 217,222 ---- *************** *** 238,248 **** #endif { "fruit", "the name of a fruit you enjoy eating", PL_FSIZ }, { "gender", "your starting gender (male or female)", 8 }, - { "horsename", "the name of your (first) horse (e.g., horsename:Trigger)", - PL_PSIZ }, - { "gender", "your starting gender (male or female)", 8 }, { "ghoulname", "the name of your (first) ghoul (e.g., ghoulname:Casper)", PL_PSIZ }, { "menustyle", "user interface for object selection", MENUTYPELEN }, { "menu_deselect_all", "deselect all items in a menu", 4}, { "menu_deselect_page", "deselect all items on this page of a menu", 4}, --- 234,243 ---- #endif { "fruit", "the name of a fruit you enjoy eating", PL_FSIZ }, { "gender", "your starting gender (male or female)", 8 }, { "ghoulname", "the name of your (first) ghoul (e.g., ghoulname:Casper)", PL_PSIZ }, + { "horsename", "the name of your (first) horse (e.g., horsename:Trigger)", + PL_PSIZ }, { "menustyle", "user interface for object selection", MENUTYPELEN }, { "menu_deselect_all", "deselect all items in a menu", 4}, { "menu_deselect_page", "deselect all items on this page of a menu", 4}, *************** *** 272,286 **** { "pickup_burden", "maximum burden picked up before prompt", 20 }, { "pickup_types", "types of objects to pick up automatically", MAXOCLASSES }, - { "ratname", "the name of your (first) rat (e.g., ratname:Sherwin)", - PL_PSIZ }, - { "reddragonname", "the name of your (first) red dragon (e.g., reddragonname:Fyre)", - PL_PSIZ }, { "race", "your starting race (e.g., Human, Elf)", PL_CSIZ }, { "role", "your starting role (e.g., Barbarian, Valkyrie)", PL_CSIZ }, { "scores", "the parts of the score list you wish to see", 32 }, - { "snakename", "the name of your (first) snake (e.g., snakename:Joe)", - PL_PSIZ }, #ifdef MSDOS { "soundcard", "type of sound card to use", 20 }, #endif --- 267,275 ---- *************** *** 296,303 **** { "videocolors", "color mappings for internal screen routines", 40 }, { "videoshades", "gray shades to map to black/gray/white", 32 }, #endif - { "whitedragonname", "the name of your (first) white dragon (e.g., whitedragonname:Snough)", - PL_PSIZ }, { "windowtype", "windowing system to use", WINTYPELEN }, { "wolfname", "the name of your (first) wolf (e.g., wolfname:Beast)", PL_PSIZ }, --- 285,290 ---- *************** *** 882,903 **** return; } - fullname = "badgername"; - if (match_optname(opts, fullname, 3, TRUE)) { - if (negated) bad_negation(fullname, FALSE); - else if ((op = string_for_env_opt(fullname, opts, FALSE)) != 0) - nmcpy(badgername, op, PL_PSIZ); - return; - } - - fullname = "batname"; - if (match_optname(opts, fullname, 3, TRUE)) { - if (negated) bad_negation(fullname, FALSE); - else if ((op = string_for_env_opt(fullname, opts, FALSE)) != 0) - nmcpy(batname, op, PL_PSIZ); - return; - } - fullname = "ghoulname"; if (match_optname(opts, fullname, 3, TRUE)) { if (negated) bad_negation(fullname, FALSE); --- 869,874 ---- *************** *** 906,943 **** return; } - fullname = "ratname"; - if (match_optname(opts, fullname, 3, TRUE)) { - if (negated) bad_negation(fullname, FALSE); - else if ((op = string_for_env_opt(fullname, opts, FALSE)) != 0) - nmcpy(ratname, op, PL_PSIZ); - return; - } - - fullname = "reddragonname"; - if (match_optname(opts, fullname, 3, TRUE)) { - if (negated) bad_negation(fullname, FALSE); - else if ((op = string_for_env_opt(fullname, opts, FALSE)) != 0) - nmcpy(reddragonname, op, PL_PSIZ); - return; - } - - fullname = "snakename"; - if (match_optname(opts, fullname, 3, TRUE)) { - if (negated) bad_negation(fullname, FALSE); - else if ((op = string_for_env_opt(fullname, opts, FALSE)) != 0) - nmcpy(snakename, op, PL_PSIZ); - return; - } - - fullname = "whitedragonname"; - if (match_optname(opts, fullname, 3, TRUE)) { - if (negated) bad_negation(fullname, FALSE); - else if ((op = string_for_env_opt(fullname, opts, FALSE)) != 0) - nmcpy(whitedragonname, op, PL_PSIZ); - return; - } - fullname = "wolfname"; if (match_optname(opts, fullname, 3, TRUE)) { if (negated) bad_negation(fullname, FALSE); --- 877,882 ---- *************** *** 1878,1885 **** MENU_UNSELECTED); /* non-modifiable compounds; deliberately put `name' first */ doset_add_menu(tmpwin, "name", plname, 0); - doset_add_menu(tmpwin, "badgername", badgername[0] ? badgername : "(null)", 0); - doset_add_menu(tmpwin, "batname", batname[0] ? batname : "(null)", 0); doset_add_menu(tmpwin, "role", (flags.initrole < 0) ? "(none)" : roles[flags.initrole].name.m, 0); doset_add_menu(tmpwin, "race", (flags.initrace < 0) ? "(none)" : --- 1817,1822 ---- *************** *** 1892,1901 **** doset_add_menu(tmpwin, "dogname", dogname[0] ? dogname : "(null)", 0); doset_add_menu(tmpwin, "horsename", horsename[0] ? horsename : "(null)", 0); doset_add_menu(tmpwin, "ghoulname", ghoulname[0] ? ghoulname : "(null)", 0); - doset_add_menu(tmpwin, "ratname", ratname[0] ? ratname : "(null)", 0); - doset_add_menu(tmpwin, "reddragonname", reddragonname[0] ? reddragonname : "(null)", 0); - doset_add_menu(tmpwin, "snakename", snakename[0] ? snakename : "(null)", 0); - doset_add_menu(tmpwin, "whitedragonname", whitedragonname[0] ? whitedragonname : "(null)", 0); doset_add_menu(tmpwin, "wolfname", wolfname[0] ? wolfname : "(null)", 0); Sprintf(buf, "%u", iflags.msg_history); doset_add_menu(tmpwin, "msghistory", buf, 0); --- 1829,1834 ---- diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/read.c ./src/read.c *** ../slashem-0.0.6E0F3+SE058/src/read.c Fri Apr 7 18:43:10 2000 --- ./src/read.c Fri Apr 7 18:44:13 2000 *************** *** 1208,1214 **** flush_screen(0); break; } ! /* break; /*NOTREACHED*/ case SPE_ENCHANT_WEAPON: case SCR_ENCHANT_WEAPON: if(uwep && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep)) --- 1208,1216 ---- flush_screen(0); break; } ! #if 0 ! break; /*NOTREACHED*/ ! #endif case SPE_ENCHANT_WEAPON: case SCR_ENCHANT_WEAPON: if(uwep && (uwep->oclass == WEAPON_CLASS || is_weptool(uwep)) diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/restore.c ./src/restore.c *** ../slashem-0.0.6E0F3+SE058/src/restore.c Fri Apr 7 18:43:51 2000 --- ./src/restore.c Fri Apr 7 18:44:13 2000 *************** *** 506,521 **** * RAMdisk. */ /* Maybe not [Tom] */ ! /* if (ramdisk) { /* PlaywoRAMdisk may not return, but if it does * it is certain that ramdisk will be 0. */ ! /* playwoRAMdisk(); /* Rewind save file and try again */ ! /* (void) lseek(fd, (off_t)0, 0); (void) uptodate(fd, (char *)0); /* skip version */ return dorecover(fd); /* 0 or 1 */ ! /* } else*/ { # endif pline("Be seeing you..."); terminate(EXIT_SUCCESS); --- 506,524 ---- * RAMdisk. */ /* Maybe not [Tom] */ ! #if 0 ! if (ramdisk) { /* PlaywoRAMdisk may not return, but if it does * it is certain that ramdisk will be 0. */ ! playwoRAMdisk(); /* Rewind save file and try again */ ! (void) lseek(fd, (off_t)0, 0); (void) uptodate(fd, (char *)0); /* skip version */ return dorecover(fd); /* 0 or 1 */ ! } else ! #endif ! { # endif pline("Be seeing you..."); terminate(EXIT_SUCCESS); diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/shk.c ./src/shk.c *** ../slashem-0.0.6E0F3+SE058/src/shk.c Fri Apr 7 18:43:51 2000 --- ./src/shk.c Fri Apr 7 18:44:13 2000 *************** *** 80,91 **** static void FDECL(shk_smooth_charge, (int *, int, int)); #endif - - /* - #ifdef BLACKMARKET - static void FDECL(attack_pet, (register struct monst *)); - #endif /* BLACKMARKET */ - #ifdef OVLB /* invariants: obj->unpaid iff onbill(obj) [unless bp->useup] --- 80,85 ---- *************** *** 568,578 **** } /* - #ifdef BLACKMARKET - static void FDECL(attack_pet, (register struct monst *)); - #endif /* BLACKMARKET */ - - /* Decide whether two unpaid items are mergable; caller is responsible for making sure they're unpaid and the same type of object; we check the price quoted by the shopkeeper and also that they both belong to the same shk. --- 562,567 ---- *************** *** 3342,3358 **** } } } ! /* static const short k_mndx[4] = { PM_KEYSTONE_KOP, PM_KOP_SERGEANT, PM_KOP_LIEUTENANT, PM_KOP_KAPTAIN }; int k_cnt[4], cnt, mndx, k; ! k_cnt[0] = cnt = abs(depth(&u.uz)) + rnd(5); */ ! /* k_cnt[1] = (cnt / 3) + 1; /* at least one sarge */ ! /* k_cnt[2] = (cnt / 6); /* maybe a lieutenant */ ! /* k_cnt[3] = (cnt / 9); /* and maybe a kaptain */ ! /* for (k = 0; k < 4; k++) { if ((cnt = k_cnt[k]) == 0) break; mndx = k_mndx[k]; if (mvitals[mndx].mvflags & G_GONE) continue; --- 3331,3348 ---- } } } ! #if 0 ! static const short k_mndx[4] = { PM_KEYSTONE_KOP, PM_KOP_SERGEANT, PM_KOP_LIEUTENANT, PM_KOP_KAPTAIN }; int k_cnt[4], cnt, mndx, k; ! k_cnt[0] = cnt = abs(depth(&u.uz)) + rnd(5); ! k_cnt[1] = (cnt / 3) + 1; /* at least one sarge */ ! k_cnt[2] = (cnt / 6); /* maybe a lieutenant */ ! k_cnt[3] = (cnt / 9); /* and maybe a kaptain */ ! for (k = 0; k < 4; k++) { if ((cnt = k_cnt[k]) == 0) break; mndx = k_mndx[k]; if (mvitals[mndx].mvflags & G_GONE) continue; *************** *** 3360,3366 **** while (cnt--) if (enexto(mm, mm->x, mm->y, &mons[mndx])) (void) makemon(&mons[mndx], mm->x, mm->y, NO_MM_FLAGS); ! } */ } #endif /* KOPS */ --- 3350,3357 ---- while (cnt--) if (enexto(mm, mm->x, mm->y, &mons[mndx])) (void) makemon(&mons[mndx], mm->x, mm->y, NO_MM_FLAGS); ! } ! #endif } #endif /* KOPS */ diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/tech.c ./src/tech.c *** ../slashem-0.0.6E0F3+SE058/src/tech.c Fri Apr 7 18:43:51 2000 --- ./src/tech.c Fri Apr 7 18:44:13 2000 *************** *** 1259,1265 **** if (delay) { /* not if (delay++), so at end delay == 0 */ delay++; ! /* use_skill(P_TINKER, 1); /* Tinker skill */ /*WAC a bit of practice so even if you're interrupted you won't be wasting your time ;B*/ return(1); /* still busy */ --- 1259,1267 ---- if (delay) { /* not if (delay++), so at end delay == 0 */ delay++; ! #if 0 ! use_skill(P_TINKER, 1); /* Tinker skill */ ! #endif /*WAC a bit of practice so even if you're interrupted you won't be wasting your time ;B*/ return(1); /* still busy */ diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/uhitm.c ./src/uhitm.c *** ../slashem-0.0.6E0F3+SE058/src/uhitm.c Fri Apr 7 18:43:10 2000 --- ./src/uhitm.c Fri Apr 7 18:44:13 2000 *************** *** 1019,1025 **** obj->known ? "the" : cnt > 1L ? "some" : "a", obj->known ? mons[obj->corpsenm].mname : "petrifying", plur(cnt)); ! /* obj->known = 1; /* (not much point...) */ useup_eggs(obj); if (!munstone(mon, TRUE)) minstapetrify(mon, TRUE); --- 1019,1027 ---- obj->known ? "the" : cnt > 1L ? "some" : "a", obj->known ? mons[obj->corpsenm].mname : "petrifying", plur(cnt)); ! #if 0 ! obj->known = 1; /* (not much point...) */ ! #endif useup_eggs(obj); if (!munstone(mon, TRUE)) minstapetrify(mon, TRUE); diff -Nacrd ../slashem-0.0.6E0F3+SE058/src/zap.c ./src/zap.c *** ../slashem-0.0.6E0F3+SE058/src/zap.c Fri Apr 7 18:43:10 2000 --- ./src/zap.c Fri Apr 7 18:44:13 2000 *************** *** 3539,3546 **** pline("%s resurrects!", Monnam(mon)); } mon->mhp = mon->mhpmax; /*wAC beam is not absorbed, so should keep on going*/ ! /* break; /* Out of while loop */ } else if (tmp == MAGIC_COOKIE) { /* disintegration */ struct obj *otmp2, *m_amulet = mlifesaver(mon); --- 3539,3548 ---- pline("%s resurrects!", Monnam(mon)); } mon->mhp = mon->mhpmax; + #if 0 /*wAC beam is not absorbed, so should keep on going*/ ! break; /* Out of while loop */ ! #endif } else if (tmp == MAGIC_COOKIE) { /* disintegration */ struct obj *otmp2, *m_amulet = mlifesaver(mon); diff -Nacrd ../slashem-0.0.6E0F3+SE058/update.322 ./update.322 *** ../slashem-0.0.6E0F3+SE058/update.322 Fri Apr 7 18:43:11 2000 --- ./update.322 Thu Jan 1 01:00:00 1970 *************** *** 1,22 **** - This is a minor bugfix release. Sorry, no major new functionality this - time around. - - The two bugs found by dozens of people, recover not working and boomerangs - sometimes causing crashes, are fixed. A problem with priest names in the - endgame found by several people is fixed. Dozens of other mostly minor - bugs noticed by one person each are fixed, and some minor extensions added. - - Several people's problems with curses.h when compiling for UNIX/tty - should be fixed as well. - - Save files are not compatible with earlier versions -- various session- - specific flags are no longer stored in the save file, instead of trying - to ignore their saved values when restoring. NetHack should diagnose - this instead of crashing mysteriously, however. - - In port news, Mac mrecover is updated, although the windowing still needs - help from a Mac programming expert. There has been some Amiga work, although - more people with time are needed there. None of us have access to an - Atari any longer, so if anyone wants that port to continue this is a good - time to make yourself known. (The UNIX, VMS, MS-DOS, and NT ports are - reasonably healthy, modulo people getting busy.) --- 0 ---- diff -Nacrd ../slashem-0.0.6E0F3+SE058/util/makedefs.c ./util/makedefs.c *** ../slashem-0.0.6E0F3+SE058/util/makedefs.c Fri Apr 7 18:43:51 2000 --- ./util/makedefs.c Fri Apr 7 18:44:13 2000 *************** *** 773,778 **** --- 773,781 ---- #ifdef X11_GRAPHICS "X11", #endif + #ifdef QT_GRAPHICS + "Qt", + #endif #ifdef GTK_GRAPHICS "GTK", #endif diff -Nacrd ../slashem-0.0.6E0F3+SE058/win/X11/tile2x11.c ./win/X11/tile2x11.c *** ../slashem-0.0.6E0F3+SE058/win/X11/tile2x11.c Fri Apr 7 18:43:11 2000 --- ./win/X11/tile2x11.c Fri Apr 7 18:44:13 2000 *************** *** 11,17 **** #include "tile2x11.h" /* x11 output file header structure */ #define OUTNAME "x11tiles" /* Default output file name */ ! /*#define PRINT_COLORMAP /* define to print the colormap */ x11_header header; --- 11,17 ---- #include "tile2x11.h" /* x11 output file header structure */ #define OUTNAME "x11tiles" /* Default output file name */ ! /* #define PRINT_COLORMAP */ /* define to print the colormap */ x11_header header; diff -Nacrd ../slashem-0.0.6E0F3+SE058/win/win32/tile2bmp.c ./win/win32/tile2bmp.c *** ../slashem-0.0.6E0F3+SE058/win/win32/tile2bmp.c Fri Apr 7 18:43:11 2000 --- ./win/win32/tile2bmp.c Fri Apr 7 18:44:13 2000 *************** *** 17,23 **** #include "win32api.h" #endif ! /* #define COLORS_IN_USE MAXCOLORMAPSIZE /* 256 colors */ #define COLORS_IN_USE 16 /* 16 colors */ #define BITCOUNT 8 --- 17,23 ---- #include "win32api.h" #endif ! /* #define COLORS_IN_USE MAXCOLORMAPSIZE */ /* 256 colors */ #define COLORS_IN_USE 16 /* 16 colors */ #define BITCOUNT 8