summaryrefslogtreecommitdiff
path: root/nethack.patch
blob: 37b5912b33640dce21234f7ba1ba3e82a3bef46e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
diff --git a/include/config.h b/include/config.h
index 141a684..3a79679 100644
--- a/include/config.h
+++ b/include/config.h
@@ -188,7 +188,7 @@
 #endif
 
 #ifndef SYSCF
-#define SYSCF                /* use a global configuration */
+//#define SYSCF                /* use a global configuration */
 #define SYSCF_FILE "sysconf" /* global configuration is in a file */
 #endif
 
@@ -201,10 +201,10 @@
 
 /* note: "larger" is in comparison with 'record', the high-scores file
    (whose name can be overridden via #define in global.h if desired) */
-#define LOGFILE  "logfile"  /* larger file for debugging purposes */
-#define XLOGFILE "xlogfile" /* even larger logfile */
-#define NEWS     "news"     /* the file containing the latest hack news */
-#define PANICLOG "paniclog" /* log of panic and impossible events */
+//#define LOGFILE  "logfile"  /* larger file for debugging purposes */
+//#define XLOGFILE "xlogfile" /* even larger logfile */
+//#define NEWS     "news"     /* the file containing the latest hack news */
+//#define PANICLOG "paniclog" /* log of panic and impossible events */
 
 /*
  *      PERSMAX, POINTSMIN, ENTRYMAX, PERS_IS_UID:
@@ -250,8 +250,8 @@
 
 #if defined(UNIX) && !defined(ZLIB_COMP) && !defined(COMPRESS)
 /* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-#define COMPRESS_EXTENSION ".Z"      /* compress's extension */
+//#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
+//#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 */
@@ -298,14 +298,14 @@
  *      a tar-like file, thus making a neater installation.  See *conf.h
  *      for detailed configuration.
  */
-/* #define DLB */ /* not supported on all platforms */
+#define DLB /* not supported on all platforms */
 
 /*
  *      Defining INSURANCE slows down level changes, but allows games that
  *      died due to program or system crashes to be resumed from the point
  *      of the last level change, after running a utility program.
  */
-#define INSURANCE /* allow crashed game recovery */
+//#define INSURANCE /* allow crashed game recovery */
 
 #ifndef MAC
 #define CHDIR /* delete if no chdir() available */
@@ -317,7 +317,7 @@
  * otherwise it will be the current directory.
  */
 #ifndef HACKDIR
-#define HACKDIR "/usr/games/lib/nethackdir"
+//#define HACKDIR "/usr/games/lib/nethackdir"
 #endif
 
 /*
@@ -340,7 +340,7 @@
 /* If GENERIC_USERNAMES is defined, and the player's username is found
  * in the list, prompt for character name instead of using username.
  * A public server should probably disable this. */
-#define GENERIC_USERNAMES "play player game games nethack nethacker"
+//#define GENERIC_USERNAMES "play player game games nethack nethacker"
 
 /*
  * Section 3:   Definitions that may vary with system type.
@@ -451,7 +451,7 @@ typedef unsigned char uchar;
 
 /* FREE_ALL_MEMORY is neither experimental nor inadequately tested,
    but it isn't necessary for successful operation of the program */
-#define FREE_ALL_MEMORY             /* free all memory at exit */
+//#define FREE_ALL_MEMORY             /* free all memory at exit */
 
 /* End of Section 4 */
 
diff --git a/include/unixconf.h b/include/unixconf.h
index 0447b82..ce535e6 100644
--- a/include/unixconf.h
+++ b/include/unixconf.h
@@ -33,10 +33,10 @@
 /* define any of the following that are appropriate */
 #define SVR4           /* use in addition to SYSV for System V Release 4 */
                        /* including Solaris 2+ */
-#define NETWORK        /* if running on a networked system */
+//#define NETWORK        /* if running on a networked system */
                        /* e.g. Suns sharing a playground through NFS */
 /* #define SUNOS4 */   /* SunOS 4.x */
-/* #define LINUX */    /* Another Unix clone */
+#define LINUX    /* Another Unix clone */
 /* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */
 /* #define GENIX */    /* Yet Another Unix Clone */
 /* #define HISX */     /* Bull Unix for XPS Machines */
@@ -55,8 +55,8 @@
 #define TEXTCOLOR      /* Use System V r3.2 terminfo color support
                         * and/or ANSI color support on termcap systems
                         * and/or X11 color */
-#define POSIX_JOB_CONTROL /* use System V / Solaris 2.x / POSIX job control
-                           * (e.g., VSUSP) */
+//#define POSIX_JOB_CONTROL /* use System V / Solaris 2.x / POSIX job control
+//                           * (e.g., VSUSP) */
 #define POSIX_TYPES /* use POSIX types for system calls and termios */
                     /* Define for many recent OS releases, including
                      * those with specific defines (since types are
@@ -128,7 +128,7 @@
  * "extra output" method is used, but not all systems provide access to
  * a fine-grained timer.
  */
-/* #define TIMED_DELAY */ /* usleep() */
+#define TIMED_DELAY /* usleep() */
 #endif
 
 /*
@@ -139,7 +139,7 @@
  * A stat system call is done on the mailbox every MAILCKFREQ moves.
  */
 #if !defined(NOMAIL)
-#define MAIL /* Deliver mail during the game */
+//#define MAIL /* Deliver mail during the game */
 #endif
 
 /* The Andrew Message System does mail a little differently from normal
@@ -213,7 +213,7 @@
  * Comment out the USE_FCNTL if for some reason you have a strange
  * OS/filesystem combination for which fcntl(2) does not work. */
 #ifdef POSIX_TYPES
-#define USE_FCNTL
+//#define USE_FCNTL
 #endif
 
 /*
@@ -281,7 +281,7 @@
 #define tgetch getchar
 
 #ifndef NOSHELL
-#define SHELL /* do not delete the '!' command */
+//#define SHELL /* do not delete the '!' command */
 #endif
 
 #include "system.h"
diff --git a/src/options.c b/src/options.c
index 87c4004..1f0c385 100644
--- a/src/options.c
+++ b/src/options.c
@@ -77,7 +77,7 @@ static struct Bool_Opt {
 #endif
     { "autodig", &flags.autodig, FALSE, SET_IN_GAME },
     { "autoopen", &flags.autoopen, TRUE, SET_IN_GAME },
-    { "autopickup", &flags.pickup, TRUE, SET_IN_GAME },
+    { "autopickup", &flags.pickup, FALSE, SET_IN_GAME },
     { "autoquiver", &flags.autoquiver, FALSE, SET_IN_GAME },
 #if defined(MICRO) && !defined(AMIGA)
     { "BIOS", &iflags.BIOS, FALSE, SET_IN_FILE },
@@ -101,7 +101,7 @@ static struct Bool_Opt {
 #if defined(MICRO) || defined(WIN32)
     { "color", &iflags.wc_color, TRUE, SET_IN_GAME }, /*WC*/
 #else /* systems that support multiple terminals, many monochrome */
-    { "color", &iflags.wc_color, FALSE, SET_IN_GAME }, /*WC*/
+    { "color", &iflags.wc_color, TRUE, SET_IN_GAME }, /*WC*/
 #endif
     { "confirm", &flags.confirm, TRUE, SET_IN_GAME },
     { "dark_room", &flags.dark_room, TRUE, SET_IN_GAME },
@@ -126,7 +126,7 @@ static struct Bool_Opt {
 #endif
     { "fullscreen", &iflags.wc2_fullscreen, FALSE, SET_IN_FILE },
     { "help", &flags.help, TRUE, SET_IN_GAME },
-    { "hilite_pet", &iflags.wc_hilite_pet, FALSE, SET_IN_GAME }, /*WC*/
+    { "hilite_pet", &iflags.wc_hilite_pet, TRUE, SET_IN_GAME }, /*WC*/
     { "hilite_pile", &iflags.hilite_pile, FALSE, SET_IN_GAME },
 #ifndef MAC
     { "ignintr", &flags.ignintr, FALSE, SET_IN_GAME },
@@ -136,7 +136,7 @@ static struct Bool_Opt {
     { "implicit_uncursed", &iflags.implicit_uncursed, TRUE, SET_IN_GAME },
     { "large_font", &iflags.obsolete, FALSE, SET_IN_FILE }, /* OBSOLETE */
     { "legacy", &flags.legacy, TRUE, DISP_IN_GAME },
-    { "lit_corridor", &flags.lit_corridor, FALSE, SET_IN_GAME },
+    { "lit_corridor", &flags.lit_corridor, TRUE, SET_IN_GAME },
     { "lootabc", &flags.lootabc, FALSE, SET_IN_GAME },
 #ifdef MAIL
     { "mail", &flags.biff, TRUE, SET_IN_GAME },
diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index 16d0874..8f5626a 100644
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -222,8 +222,8 @@ WINBEOBJ =
 
 #
 #
-#WINSRC = $(WINTTYSRC)
-#WINOBJ = $(WINTTYOBJ)
+WINSRC = $(WINTTYSRC)
+WINOBJ = $(WINTTYOBJ)
 
 # on some systems the termcap library is in -ltermcap or -lcurses
 # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
@@ -238,7 +238,7 @@ WINBEOBJ =
 # WINTTYLIB = -ltermcap
 # WINTTYLIB = -lcurses
 # WINTTYLIB = -lcurses16
-# WINTTYLIB = -lncurses
+WINTTYLIB = -lncurses
 #WINTTYLIB = -ltermlib
 #
 # libraries for X11
@@ -263,7 +263,7 @@ WINGEMLIB = -le_gem -lgem
 # libraries for BeOS 
 WINBELIB = -lbe
 
-#WINLIB = $(WINTTYLIB)
+WINLIB = $(WINTTYLIB)
 
 # any other strange libraries your system needs (for Sysunix only -- the more
 # specialized targets should already be right)