nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into win32-x64-working

Browse Source 
Conflicts:
	src/mon.c

 Changes to be committed:
	modified:   DEVEL/Developer.txt
	modified:   dat/endgame.des
	modified:   include/patchlevel.h
	modified:   include/you.h
	modified:   src/mon.c
	modified:   src/sounds.c
	modified:   src/spell.c
	modified:   src/vault.c
	modified:   win/share/tiletext.c
This commit is contained in:
nhmall
2015-04-21 06:39:52 -04:00
parent 1e06a7c675 a155d1d474
commit 3969eb2af1
9 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/patchlevel.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.5 patchlevel.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 patchlevel.h $NHDT-Date: 1429513493 2015/04/20 07:04:53 $ $NHDT-Branch: master $:$NHDT-Revision: 1.102 $ */
/* NetHack 3.5 patchlevel.h $Date: 2012/04/14 08:31:03 $ $Revision: 1.93 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -14,7 +14,7 @@
* Incrementing EDITLEVEL can be used to force invalidation of old bones
* and save files.
*/
#define EDITLEVEL 62
#define EDITLEVEL 63
#define COPYRIGHT_BANNER_A \
"NetHack, Copyright 1985-2015"

5
include/you.h
View File

@@ -1,4 +1,4 @@
/* NetHack 3.5 you.h $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
/* NetHack 3.5 you.h $NHDT-Date: 1429513494 2015/04/20 07:04:54 $ $NHDT-Branch: master $:$NHDT-Revision: 1.25 $ */
/* NetHack 3.5 you.h $Date: 2012/04/14 08:31:03 $ $Revision: 1.13 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -39,12 +39,13 @@ struct u_have {
struct u_event {
Bitfield(minor_oracle,1); /* received at least 1 cheap oracle */
Bitfield(major_oracle,1); /* " expensive oracle */
Bitfield(read_tribute,1); /* read a passage from a novel */
Bitfield(qcalled,1); /* called by Quest leader to do task */
Bitfield(qexpelled,1); /* expelled from the Quest dungeon */
Bitfield(qcompleted,1); /* successfully completed Quest task */
Bitfield(uheard_tune,2); /* 1=know about, 2=heard passtune */
Bitfield(uopened_dbridge,1); /* opened the drawbridge */
Bitfield(uopened_dbridge,1); /* opened the drawbridge */
Bitfield(invoked,1); /* invoked Gate to the Sanctum level */
Bitfield(gehennom_entered,1); /* entered Gehennom via Valley */
Bitfield(uhand_of_elbereth,2); /* became Hand of Elbereth */