From a65a873e56c35780711e9f73872c4fe0254589b0 Mon Sep 17 00:00:00 2001 From: cgd Date: Mon, 24 Apr 1995 12:21:37 +0000 Subject: Various changes to make games compile w/o warnings on the alpha: Include appropriate includes, delete bogus function declarations, change sizes of variables and casts. --- phantasia/macros.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phantasia/macros.h') diff --git a/phantasia/macros.h b/phantasia/macros.h index 6c46c868..39b003c3 100644 --- a/phantasia/macros.h +++ b/phantasia/macros.h @@ -1,4 +1,4 @@ -/* $NetBSD: macros.h,v 1.2 1995/03/24 03:58:52 cgd Exp $ */ +/* $NetBSD: macros.h,v 1.3 1995/04/24 12:24:34 cgd Exp $ */ /* * macros.h - macro definitions for Phantasia @@ -7,7 +7,9 @@ #define ROLL(BASE,INTERVAL) floor((BASE) + (INTERVAL) * drandom()) #define SGN(X) ((X) < 0 ? -1 : 1) #define CIRCLE(X, Y) floor(distance(X, 0.0, Y, 0.0) / 125.0 + 1) +#undef MAX #define MAX(A, B) ((A) > (B) ? (A) : (B)) +#undef MIN #define MIN(A, B) ((A) < (B) ? (A) : (B)) #define ILLCMD() mvaddstr(5, 0, Illcmd) #define MAXMOVE() (Player.p_level * 1.5 + 1) -- cgit v1.2.3-56-ge451