Merge branch 'master' into derek-farming

* 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
104 changed files with 21012 additions and 11473 deletions

View File

@@ -2366,6 +2366,9 @@ left_side(row, left_mark, right, limits)
char *row_max = NULL;
int lim_min;
#ifdef GCC_WARN
rowp = row_min = row_max = 0;
#endif
nrow = row+step;
deeper = good_row(nrow) && (!limits || (*limits >= *(limits+1)));
if(!vis_func) {