summaryrefslogtreecommitdiffstats
path: root/phantasia/macros.h
diff options
context:
space:
mode:
Diffstat (limited to 'phantasia/macros.h')
-rw-r--r--phantasia/macros.h4
1 files changed, 3 insertions, 1 deletions
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)