Sanity fixes for input buffer handling. From OpenBSD

[bsdgames-darwin.git] / monop / mon.dat

diff --git a/monop/mon.dat b/monop/mon.dat
index be1b68be730408ce2da3249f0050a03ed475869d..24a5a88f6dcb412a78b22b42e08698a5c842a646 100644 (file)
--- a/monop/mon.dat
+++ b/monop/mon.dat
@@ -1,4 +1,4 @@
-/*     $NetBSD: mon.dat,v 1.3 2003/08/07 09:37:28 agc Exp $    */
+/*     $NetBSD: mon.dat,v 1.4 2008/01/28 06:16:13 dholland Exp $       */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -31,12 +31,18 @@
  *     @(#)mon.dat     5.4 (Berkeley) 5/31/93
  */
 
-/* name        owner   num_in  num_own h_cost  not_m           mon_n       sq */
-{0,    -1,     2,      0,      1,      "Purple",       "PURPLE",   {1,3}},
-{0,    -1,     3,      0,      1,      "Lt. Blue",     "LT. BLUE", {6,8,9}},
-{0,    -1,     3,      0,      2,      "Violet",       "VIOLET",   {11,13,14}},
-{0,    -1,     3,      0,      2,      "Orange",       "ORANGE",   {16,18,19}},
-{0,    -1,     3,      0,      3,      "Red",          "RED",      {21,23,24}},
-{0,    -1,     3,      0,      3,      "Yellow",       "YELLOW",   {26,27,29}},
-{0,    -1,     3,      0,      4,      "Green",        "GREEN",    {31,32,34}},
-{0,    -1,     2,      0,      4,      "Dk. Blue",     "DK. BLUE", {37,39}}
+#define MONINIT(num_in, h_cost, not_m, mon_n, sq1,sq2,sq3) \
+     {0,    -1, num_in, 0,      h_cost, not_m, mon_n, {sq1,sq2,sq3}, {0,0,0}}
+/* name  owner          num_own                                      sq */
+
+/*   num_in h_cost  not_m      mon_n       sqnums */
+MONINIT(2,  1, "Purple",       "PURPLE",   1,3, 0),
+MONINIT(3,  1, "Lt. Blue",     "LT. BLUE", 6,8,9),
+MONINIT(3,  2, "Violet",       "VIOLET",   11,13,14),
+MONINIT(3,  2, "Orange",       "ORANGE",   16,18,19),
+MONINIT(3,  3, "Red",          "RED",      21,23,24),
+MONINIT(3,  3, "Yellow",       "YELLOW",   26,27,29),
+MONINIT(3,  4, "Green",        "GREEN",    31,32,34),
+MONINIT(2,  4, "Dk. Blue",     "DK. BLUE", 37,39, 0),
+
+#undef MONINIT