Skip to content

Commit 3d3ee78

Browse files
nhmallnhmall
committed
Merge branch 'master' into win32-x64-working
Conflicts: src/files.c src/potion.c sys/winnt/Makefile.msc Changes to be committed: modified: .gitignore modified: DEVEL/hooksdir/nhsub modified: dat/.gitignore modified: dat/opthelp modified: doc/Guidebook.mn modified: doc/Guidebook.tex modified: doc/fixes35.0 modified: include/context.h modified: include/decl.h modified: include/extern.h modified: include/flag.h modified: include/hack.h modified: include/patchlevel.h modified: src/apply.c modified: src/attrib.c modified: src/decl.c modified: src/do.c modified: src/do_name.c modified: src/dothrow.c modified: src/eat.c modified: src/files.c modified: src/hack.c modified: src/invent.c modified: src/lock.c modified: src/mklev.c modified: src/mondata.c modified: src/monmove.c modified: src/music.c modified: src/options.c modified: src/potion.c modified: src/pray.c modified: src/sit.c modified: src/sp_lev.c modified: src/uhitm.c modified: sys/share/posixregex.c modified: sys/winnt/Makefile.msc modified: util/.gitignore modified: win/win32/vs2010/NetHackW.vcxproj
2 parents 116a414 + 647a072 commit 3d3ee78

38 files changed

Lines changed: 272 additions & 139 deletions

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TAGS
44
.make.state
55
.nse_depinfo
66
*~
7-
#*
7+
\#*
88
.#*
99
,*
1010
_$*

‎DEVEL/hooksdir/nhsub‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@ my $count = s/\$$PREFIX-(([A-Za-z][A-Za-z0-9_]*)(: ([^\x24]+))?)\$/&handlevar($2
267267
rename $ofile, $file or die "Can't rename $ofile to $file";
268268
}
269269

270+
# XXX docs for --fixup and --squash are wrong in synopsis. --file missing
271+
# --message --template -t
270272
sub cmdparse {
271273
my(@in) = @_;
272274

@@ -315,6 +317,21 @@ sub cmdparse {
315317
if($opt{cmd} eq 'add' && $single eq 'n'){
316318
exit 0;
317319
}
320+
#need to deal with options that eat a following element (-m, -F etc etc)
321+
#add: nothing?
322+
#commit: -c -C -F -m
323+
# -u<mode> mode is optional
324+
# -S<keyid> keyid is optional
325+
if($opt{cmd} eq 'commit'){
326+
if($single =~ m/[uS]/){
327+
last;
328+
}
329+
if($single =~ m/[cCFm]/){
330+
#XXX this will be a mess if the argument is wrong, but can we tell? No.
331+
shift @in;
332+
last;
333+
}
334+
}
318335
}
319336
}
320337
shift @in;

‎dat/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ bogusmon
99
engrave
1010
epitaph
1111
x11tiles
12+
nhtiles.bmp
1213
*.lev
1314
spec_levs
1415
quest_levs

‎dat/opthelp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Boolean options not under specific compile flags (with default values in []):
33
option setting, which is reached via the 'O' cmd.)
44

55
autodig dig if moving and wielding digging tool [FALSE]
6+
autoopen walking into a door attempts to open it [TRUE]
67
autopickup automatically pick up objects you move over [TRUE]
78
autoquiver when firing with an empty quiver, select some
89
suitable inventory weapon to fill the quiver [FALSE]

‎doc/Guidebook.mn‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1905,6 +1905,8 @@ Cannot be set with the `O' command.
19051905
.lp autodig
19061906
Automatically dig if you are wielding a digging tool and moving into a place
19071907
that can be dug (default false).
1908+
.lp autoopen
1909+
Walking into a door attempts to open it (default true).
19081910
.lp "autopickup "
19091911
Automatically pick up things onto which you move (default on).
19101912
See

‎doc/Guidebook.tex‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2306,6 +2306,9 @@ \subsection*{Customization options}
23062306
Automatically dig if you are wielding a digging tool and moving into a place
23072307
that can be dug (default false).
23082308
%.lp
2309+
\item[\ib{autoopen}]
2310+
Walking into a door attempts to open it (default true).
2311+
%.lp
23092312
\item[\ib{autopickup}]
23102313
Automatically pick up things onto which you move (default on).
23112314
See ``{\it pickup\_types\/}'' to refine the behavior.

‎doc/fixes35.0‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -897,6 +897,11 @@ allow showing legal positions for stinking cloud, jumping and polearms
897897
cloned creatures (of any type) don't deathdrop items
898898
pudding corpses behave somewhat differently than before
899899
mithril armor should have silver color
900+
lichen corpse is an acid indicator
901+
camera may contain a picture-painting demon
902+
some monsters can eat through iron bars
903+
inaccessible niches occasionally have iron bars in front
904+
sinks may teleport or polymorph
900905

901906

902907
Platform- and/or Interface-Specific Fixes
@@ -1161,6 +1166,7 @@ Aardvark Joe's Extended Logfile
11611166
Michael Deutschmann's use_darkgray
11621167
Clive Crous' dark_room
11631168
sortloot by Jeroen Demeyer and Jukka Lahtinen
1169+
Auto open doors by Stefano Busti
11641170

11651171

11661172
Code Cleanup and Reorganization

‎include/context.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ struct context_info {
110110
boolean bypasses; /* bypass flag is set on at least one fobj */
111111
boolean botl; /* partially redo status line */
112112
boolean botlx; /* print an entirely new bottom line */
113+
boolean door_opened; /* set to true if door was opened during test_move */
113114
struct dig_info digging;
114115
struct victual_info victual;
115116
struct tin_info tin;

‎include/decl.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ E NEARDATA struct c_color_names {
265265
const char *const c_black, *const c_amber, *const c_golden,
266266
*const c_light_blue,*const c_red, *const c_green,
267267
*const c_silver, *const c_blue, *const c_purple,
268-
*const c_white;
268+
*const c_white, *const c_orange;
269269
} c_color_names;
270270
#define NH_BLACK c_color_names.c_black
271271
#define NH_AMBER c_color_names.c_amber
@@ -277,6 +277,7 @@ E NEARDATA struct c_color_names {
277277
#define NH_BLUE c_color_names.c_blue
278278
#define NH_PURPLE c_color_names.c_purple
279279
#define NH_WHITE c_color_names.c_white
280+
#define NH_ORANGE c_color_names.c_orange
280281

281282
/* The names of the colors used for gems, etc. */
282283
E const char *c_obj_colors[];

‎include/extern.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ E void FDECL(m_unleash, (struct monst *,BOOLEAN_P));
3939
E void NDECL(unleash_all);
4040
E boolean NDECL(next_to_u);
4141
E struct obj *FDECL(get_mleash, (struct monst *));
42+
E const char *NDECL(beautiful);
4243
E void FDECL(check_leash, (XCHAR_P,XCHAR_P));
4344
E boolean FDECL(um_dist, (XCHAR_P,XCHAR_P,XCHAR_P));
4445
E boolean FDECL(snuff_candle, (struct obj *));
@@ -497,6 +498,7 @@ E int FDECL(omon_adj, (struct monst *,struct obj *,BOOLEAN_P));
497498
E int FDECL(thitmonst, (struct monst *,struct obj *));
498499
E int FDECL(hero_breaks, (struct obj *,XCHAR_P,XCHAR_P,BOOLEAN_P));
499500
E int FDECL(breaks, (struct obj *,XCHAR_P,XCHAR_P));
501+
E void FDECL(release_camera_demon, (struct obj *, XCHAR_P,XCHAR_P));
500502
E void FDECL(breakobj, (struct obj *,XCHAR_P,XCHAR_P,BOOLEAN_P,BOOLEAN_P));
501503
E boolean FDECL(breaktest, (struct obj *));
502504
E boolean FDECL(walk_path, (coord *, coord *, boolean (*)(genericptr_t,int,int), genericptr_t));
@@ -979,6 +981,7 @@ E int NDECL(doforce);
979981
E boolean FDECL(boxlock, (struct obj *,struct obj *));
980982
E boolean FDECL(doorlock, (struct obj *,int,int));
981983
E int NDECL(doopen);
984+
E int FDECL(doopen_indir, (int,int));
982985
E int NDECL(doclose);
983986

984987
#ifdef MAC
@@ -1366,6 +1369,7 @@ E boolean FDECL(onscary, (int,int,struct monst *));
13661369
E void FDECL(monflee, (struct monst *, int, BOOLEAN_P, BOOLEAN_P));
13671370
E int FDECL(dochug, (struct monst *));
13681371
E int FDECL(m_move, (struct monst *,int));
1372+
E void FDECL(dissolve_bars, (int,int));
13691373
E boolean FDECL(closed_door, (int,int));
13701374
E boolean FDECL(accessible, (int,int));
13711375
E void FDECL(set_apparxy, (struct monst *));

0 commit comments

Comments
 (0)