Rename com#.c to command#.c to avoid conflicts with those file basenames

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

diff --git a/battlestar/nightobjs.c b/battlestar/nightobjs.c
index 43de722f015ec8bda27333433262b1caf06d512e..fa654879941697a01de60f6188880cda1d0e3312 100644 (file)
--- a/battlestar/nightobjs.c
+++ b/battlestar/nightobjs.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: nightobjs.c,v 1.8 1999/09/18 16:42:29 jsm Exp $        */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,70 +33,75 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char sccsid[] = "@(#)nightobjs.c        5.3 (Berkeley) 6/1/90";
-#endif /* not lint */
+#if 0
+static char sccsid[] = "@(#)nightobjs.c        8.2 (Berkeley) 4/28/95";
+#else
+__RCSID("$NetBSD: nightobjs.c,v 1.8 1999/09/18 16:42:29 jsm Exp $");
+#endif
+#endif                         /* not lint */
 
-#include "externs.h"
+#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}
 };