Sitelet https://github.com/NetHack/NetHack/commit/3ffd330c31ecbec0356237262ad9c38136cca311
Skip to content

Commit 3ffd330

Browse files
author
Dean Luick
committed
Remove vision tables from makedefs
Update makdefs source and its man page. Remove all mentions of the vision table files from: o .gitattributes o .gitignore o Files o Cross-compiling Add a brief note in the fixes file.
1 parent 62ba302 commit 3ffd330

10 files changed

Lines changed: 27 additions & 454 deletions

File tree

‎Cross-compiling‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ Using the cross-compiler, build the following targets:
388388
src/symbols.c, src/sys.c, src/teleport.c,
389389
src/timeout.c, src/topten.c, src/track.c,
390390
src/trap.c, src/u_init.c, src/uhitm.c, src/vault.c,
391-
src/version.c, src/vis_tab.c, src/vision.c,
391+
src/version.c, src/vision.c,
392392
src/weapon.c, src/were.c, src/wield.c, src/windows.c,
393393
src/wizard.c, src/worm.c, src/worn.c, src/write.c,
394394
src/zap.c, sys/share/cppregex.cpp

‎Files‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ tile.h
537537
win32api.h
538538

539539
(files generated by makedefs at compile time)
540-
date.h onames.h pm.h vis_tab.h
540+
date.h onames.h pm.h
541541

542542
(files generated by yacc (or copied from sys/share) at compile time)
543543
dgn_comp.h lev_comp.h
@@ -553,7 +553,6 @@ qt_kde0.moc qt_win.moc qttableview.moc
553553
monstr.c
554554

555555
(file generated by makedefs at compile time)
556-
vis_tab.c
557556

558557
(file optionally generated by tilemap at compile time)
559558
tile.c

‎doc/fixes37.0‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,7 @@ replace "aligned priest" entries in Pri-loca.lua, astral.lua, minetn-1.lua,
478478
and sanctum.lua, with "aligned cleric"
479479
attempting to swap places with a peaceful monster might cause it to flee
480480
gender-specific monster names can be used in .lua files with the gender upheld
481+
remove unused vision tables
481482

482483
curses: 'msg_window' option wasn't functional for curses unless the binary
483484
also included tty support

‎doc/makedefs.6‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ makedefs \- NetHack miscellaneous build-time functions
3434
.B -r
3535
|
3636
.B -h
37-
|
38-
.B -z
3937
}
4038
.P
4139
.B makedefs --input
@@ -127,12 +125,6 @@ Generate the
127125
.B oracles
128126
file.
129127
.br
130-
.TP
131-
.B -z
132-
Generate
133-
.I vis_tab.c
134-
and
135-
.IR vis_tab.h .
136128
.SH LONG COMMANDS
137129
.TP
138130
.B --debug

‎doc/makedefs.txt‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ NAME
66
makedefs - NetHack miscellaneous build-time functions
77

88
SYNOPSIS
9-
makedefs { -o | -d | -e | -m | -v | -p | -q | -r | -h | -z }
9+
makedefs { -o | -d | -e | -m | -v | -p | -q | -r | -h }
1010

1111
makedefs --input file --output file --command
1212

@@ -26,19 +26,22 @@ SHORT COMMANDS
2626

2727
-d Generate data.base.
2828

29-
-v Generate date.h and options file. It will read dat/gitinfo.txt,
29+
-e Generate dungeon.pdf. The input file dungeon.def is passed
30+
through the same logic as that used by the --grep command; see
31+
the MDGREP FUNCTIONS section below for details.
32+
33+
-m Generate date.h and options file. It will read dat/gitinfo.txt,
3034
only if it is present, to obtain githash= and gitbranch=
35+
info and include related preprocessor #defines in date.h file.
3136

3237
-p Generate pm.h
3338

34-
-r Generate the rumors file.
39+
-q Generate the rumors file.
3540

3641
-s Generate the bogusmon , engrave and epitaphfiles.
3742

3843
-h Generate the oracles file.
3944

40-
-z Generate vis_tab.c and vis_tab.h.
41-
4245
LONG COMMANDS
4346
--debug
4447
Show debugging output.
@@ -60,13 +63,13 @@ LONG COMMANDS
6063
newline. If specified, the delimiter is used between each part
6164
of the version string.
6265

63-
--grep Filter the input file to the output file. See the MDGREP FUNC-
66+
--grep Filter the input file to the output file. See the MDGREP FUNC‐
6467
TIONS section below for information on controlling the filtering
6568
operation.
6669

6770
--grep-showvars
68-
Show the name and value for each variable known to the grep
69-
option.
71+
Show the name and value for each variable known to the grep op‐
72+
tion.
7073

7174
--grep-trace
7275
Turn on debug tracing for the grep function ( --grep must be
@@ -83,32 +86,32 @@ LONG COMMANDS
8386
MDGREP FUNCTIONS
8487
The --grep command (and certain other commands) filter their input, on
8588
a line-by-line basis, according to control lines embedded in the input
86-
and on information gleaned from the NetHack(6) configuration. This
87-
allows certain changes such as embedding platform-specific documenta-
88-
tion into the master documentation files.
89+
and on information gleaned from the NetHack(6) configuration. This al‐
90+
lows certain changes such as embedding platform-specific documentation
91+
into the master documentation files.
8992

9093
Rules:
9194

9295
- The default conditional state is printing enabled.
9396

9497
- Any line NOT starting with a caret (^) is either suppressed
95-
or passed through unchanged depending on the current condi-
98+
or passed through unchanged depending on the current condi‐
9699
tional state.
97100

98101
- Any line starting with a caret is a control line; as in C,
99-
zero or more spaces may be embedded in the line almost any-
102+
zero or more spaces may be embedded in the line almost any‐
100103
where (except immediately after the caret); however the
101104
caret must be in column 1.
102105

103106
- Conditionals may be nested.
104107

105-
- Makedefs will exit with an error code if any errors are
106-
detected; processing will continue (if it can) to allow as
108+
- Makedefs will exit with an error code if any errors are de‐
109+
tected; processing will continue (if it can) to allow as
107110
many errors as possible to be detected.
108111

109-
- Unknown identifiers are treated as both TRUE and as an
110-
error. Note that --undef or #undef in the NetHack(6) con-
111-
figuration are different from unknown.
112+
- Unknown identifiers are treated as both TRUE and as an er‐
113+
ror. Note that --undef or #undef in the NetHack(6) configu‐
114+
ration are different from unknown.
112115

113116
Control lines:
114117

@@ -134,10 +137,9 @@ SEE ALSO
134137

135138
COPYRIGHT
136139
This file is Copyright (C) Kenneth Lorber and was last modified
137-
2018/04/25 (version NetHack-3.6.0:1.10). NetHack may be freely redis-
140+
2018/04/25 (version NetHack-3.6.0:1.10). NetHack may be freely redis‐
138141
tributed. See license for details.
139142

140143

141144

142-
143145
NETHACK 1 Jan 2020 MAKEDEFS(6)

‎include/.gitattributes‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
* NH_filestag=(file%s_for_all_versions)
2-
..files NH_filegenerated=win32api.h,tile.h,dgn_comp.h,lev_comp.h,date.h,onames.h,pm.h,vis_tab.h
2+
..files NH_filegenerated=win32api.h,tile.h,dgn_comp.h,lev_comp.h,date.h,onames.h,pm.h
33

44
win32api.h NH_filesgentag=(file%s_for_win32_that_are_moved_into_include_at_compile_time)
55

@@ -11,7 +11,6 @@ lev_comp.h NH_filesgentag=>dgn_comp.h
1111
date.h NH_filesgentag=(file%s_generated_by_makedefs_at_compile_time)
1212
onames.h NH_filesgentag=>date.h
1313
pm.h NH_filesgentag=>date.h
14-
vis_tab.h NH_filesgentag=>date.h
1514

1615
wintty.h NH_filestag=(file%s_for_tty_versions)
1716

‎include/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
date.h
33
onames.h
44
pm.h
5-
vis_tab.h
65
dgn_comp.h
76
lev_comp.h
87
tile.h

‎src/.gitattributes‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
* NH_filestag=(file%s_for_all_versions)
2-
..files NH_filegenerated=Makefile,Makefile.bcc,Makefile.gcc,qt_kde0.moc,qt_win.moc,qttableview.moc,tile.c,monstr.c,vis_tab.c
2+
..files NH_filegenerated=Makefile,Makefile.bcc,Makefile.gcc,qt_kde0.moc,qt_win.moc,qttableview.moc,tile.c,monstr.c
33
Makefile.bcc NH_filesgentag=(file%s_for_win32_that_are_moved_into_src_at_compile_time)
44
Makefile.gcc NH_filesgentag=>Makefile.bcc
55
Makefile NH_filesgentag=>Makefile.bcc
@@ -10,5 +10,3 @@ qttableview.moc NH_filesgentag=>qt_kde0.moc
1010

1111
tile.c NH_filesgentag=(file%s_optionally_generated_by_tilemap_at_compile_time)
1212
monstr.c NH_filesgentag=(file%s_generated_by_makedefs_at_compile_time_by_some_ports)
13-
14-
vis_tab.c NH_filesgentag=(file%s_generated_by_makedefs_at_compile_time)

‎src/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
config.h-t
2-
vis_tab.c
32
monstr.c
43
hack.h-t
54
tile.c

0 commit comments

Comments
 (0)