Fix warp compilation

[bsdgames-darwin.git] / battlestar / nightobjs.c

diff --git a/battlestar/nightobjs.c b/battlestar/nightobjs.c
index 415e811ae132cb2869100e4e13d47f6a8a5a3538..706ea5c3704f22ea026c2337bb0cf411fb15cd0c 100644 (file)
--- a/battlestar/nightobjs.c
+++ b/battlestar/nightobjs.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: nightobjs.c,v 1.5 1997/10/10 11:40:11 lukem Exp $      */
+/*     $NetBSD: nightobjs.c,v 1.9 2003/08/07 09:37:03 agc Exp $        */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,70 +34,70 @@
 #if 0
 static char sccsid[] = "@(#)nightobjs.c        8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: nightobjs.c,v 1.5 1997/10/10 11:40:11 lukem Exp $");
+__RCSID("$NetBSD: nightobjs.c,v 1.9 2003/08/07 09:37:03 agc Exp $");
 #endif
-#endif /* not lint */
+#endif                         /* not lint */
 
 #include "extern.h"
 
-struct objs nightobjs[] = {
-       { 218,  PAJAMAS },
-       { 235,  NATIVE },
-       { 92,   PAPAYAS },
-       { 92,   PINEAPPLE },
-       { 92,   KIWI },
-       { 92,   MANGO },
-       { 92,   NATIVE },
-       { 92,   MAN },
-       { 181,  LAMPON },
-       { 236,  LAMPON },
-       { 92,   LAMPON },
-       { 216,  WOODSMAN },
-       { 216,  DEADWOOD },
-       { 216,  MALLET },
-       { 168,  WOODSMAN },
-       { 168,  DEADWOOD },
-       { 168,  MALLET },
-       { 170,  WOODSMAN },
-       { 170,  DEADWOOD },
-       { 170,  MALLET },
-       { 124,  SHIELD },
-       { 124,  HALBERD },
-       { 124,  ELF },
-       { 144,  SHIELD },
-       { 144,  HALBERD },
-       { 144,  ELF },
-       { 113,  SHIELD },
-       { 113,  HALBERD },
-       { 113,  ELF },
-       { 161,  SHIELD },
-       { 161,  HALBERD },
-       { 161,  ELF },
-       { 169,  SHIELD },
-       { 169,  HALBERD },
-       { 169,  ELF },
-       { 182,  SHIELD },
-       { 182,  HALBERD },
-       { 182,  ELF },
-       { 198,  SHIELD },
-       { 198,  HALBERD },
-       { 198,  ELF },
-       { 212,  SHIELD },
-       { 212,  HALBERD },
-       { 212,  ELF },
-       { 216,  SHIELD },
-       { 216,  HALBERD },
-       { 216,  ELF },
-       { 226,  SHIELD },
-       { 226,  HALBERD },
-       { 226,  ELF },
-       { 228,  SHIELD },
-       { 228,  HALBERD },
-       { 228,  ELF },
-       { 68,   CYLON },
-       { 144,  SHOVEL },
-       { 249,  FOOT },
-       { 250,  FOOT },
-       { 93,   PAPAYAS },
-       { 0 }
+const struct objs nightobjs[] = {
+       {218, PAJAMAS},
+       {235, NATIVE},
+       {92, PAPAYAS},
+       {92, PINEAPPLE},
+       {92, KIWI},
+       {92, MANGO},
+       {92, NATIVE},
+       {92, MAN},
+       {181, LAMPON},
+       {236, LAMPON},
+       {92, LAMPON},
+       {216, WOODSMAN},
+       {216, DEADWOOD},
+       {216, MALLET},
+       {168, WOODSMAN},
+       {168, DEADWOOD},
+       {168, MALLET},
+       {170, WOODSMAN},
+       {170, DEADWOOD},
+       {170, MALLET},
+       {124, SHIELD},
+       {124, HALBERD},
+       {124, ELF},
+       {144, SHIELD},
+       {144, HALBERD},
+       {144, ELF},
+       {113, SHIELD},
+       {113, HALBERD},
+       {113, ELF},
+       {161, SHIELD},
+       {161, HALBERD},
+       {161, ELF},
+       {169, SHIELD},
+       {169, HALBERD},
+       {169, ELF},
+       {182, SHIELD},
+       {182, HALBERD},
+       {182, ELF},
+       {198, SHIELD},
+       {198, HALBERD},
+       {198, ELF},
+       {212, SHIELD},
+       {212, HALBERD},
+       {212, ELF},
+       {216, SHIELD},
+       {216, HALBERD},
+       {216, ELF},
+       {226, SHIELD},
+       {226, HALBERD},
+       {226, ELF},
+       {228, SHIELD},
+       {228, HALBERD},
+       {228, ELF},
+       {68, CYLON},
+       {144, SHOVEL},
+       {249, FOOT},
+       {250, FOOT},
+       {93, PAPAYAS},
+       {0, 0}
 };