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

Merge branch 'master' into derek-farming

Browse Source 
* master: (160 commits)
  Add doors correctly
  bug fixes for nhsub
  Generate oracle monsters after subroom
  Generate minetown guards after subrooms
  ...

Conflicts:
	src/do.c
	src/files.c
	src/hack.c
	src/mon.c
	src/vision.c
This commit is contained in:
Derek S. Ray
2015-04-01 17:40:25 -04:00
parent ca60cac105 2a4affbf6f
commit af5ed436b8
104 changed files with 21012 additions and 11473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hack.c
View File

@@ -1104,7 +1104,7 @@ domove()
register struct monst *mtmp;
register struct rm *tmpr;
register xchar x,y;
struct trap *trap = NULL;
struct trap *trap = (struct trap *)0;
int wtcap;
boolean on_ice;
xchar chainx, chainy, ballx, bally; /* ball&chain new positions */