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

remove extraneous MAX/MIN

Browse Source 
extralev.c defines and uses MAX/MIN macros instead of max/min from hack.h
This commit is contained in:
keni
2010-01-10 02:35:19 +00:00
parent dbaa63c760
commit 655adf8535
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/extralev.c
View File

@@ -1,5 +1,4 @@
/* NetHack 3.5 extralev.c $Date$ $Revision$ */
/* SCCS Id: @(#)extralev.c 3.5 2001/09/06 */
/* Copyright 1988, 1989 by Ken Arromdee */
/* NetHack may be freely redistributed. See license for details. */
@@ -35,27 +34,21 @@ int x1,y1,x2,y2;
int horiz;
{
register int x,y,middle;
#ifndef MAX
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef MIN
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
if (horiz) {
middle = x1 + rn2(x2-x1+1);
for(x=MIN(x1,middle); x<=MAX(x1,middle); x++)
for(x=min(x1,middle); x<=max(x1,middle); x++)
corr(x, y1);
for(y=MIN(y1,y2); y<=MAX(y1,y2); y++)
for(y=min(y1,y2); y<=max(y1,y2); y++)
corr(middle,y);
for(x=MIN(middle,x2); x<=MAX(middle,x2); x++)
for(x=min(middle,x2); x<=max(middle,x2); x++)
corr(x, y2);
} else {
middle = y1 + rn2(y2-y1+1);
for(y=MIN(y1,middle); y<=MAX(y1,middle); y++)
for(y=min(y1,middle); y<=max(y1,middle); y++)
corr(x1, y);
for(x=MIN(x1,x2); x<=MAX(x1,x2); x++)
for(x=min(x1,x2); x<=max(x1,x2); x++)
corr(x, middle);
for(y=MIN(middle,y2); y<=MAX(middle,y2); y++)
for(y=min(middle,y2); y<=max(middle,y2); y++)
corr(x2,y);
}
}