Mercurial > hg > batmud > maputils

changeset 943:e98b0f94327e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update internal flag fields to accommodate a new setting.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 13 May 2010 22:54:45 +0000
parents f48f9538cb29
children a2918394b706 d4ff63a32eaf
files mkloc.c
diffstat 1 files changed, 23 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/mkloc.c	Thu May 13 01:45:54 2010 +0000
+++ b/mkloc.c	Thu May 13 22:54:45 2010 +0000
@@ -2,7 +2,7 @@
  * mkloc - Manipulate and convert BatMUD location data files
  *
  * Programmed by Matti 'ccr' Hämäläinen (Ggr Pupunen)
- * (C) Copyright 2006-2009 Tecnic Software productions (TNSP)
+ * (C) Copyright 2006-2010 Tecnic Software productions (TNSP)
  */
 #include "maputils.h"
 #include <string.h>
@@ -43,26 +43,31 @@
  * of this settings is addition of "GUILD", "SHRINE"-type strings to labels,
  * but this information can be used in other ways too.
  */
-#define LOCF_NONE           (0x0000)
-#define LOCF_M_SCENIC1      (0x0001)    /* '?' Scenic marker */
-#define LOCF_M_SCENIC2      (0x0002)    /* '%' Shrine marker/etc */
-#define LOCF_M_PCITY        (0x0004)    /* 'C' Player city */
-#define LOCF_M_CITY         (0x0008)    /* 'c' City */
-#define LOCF_M_MASK         (0x000F)
+#define LOCF_NONE           (0x00000)
+
+/* Marker types */
+#define LOCF_M_SCENIC1      (0x00001)   /* '?' Scenic marker */
+#define LOCF_M_SCENIC2      (0x00002)   /* '%' Shrine marker/etc */
+#define LOCF_M_PCITY        (0x00004)   /* 'C' Player city */
+#define LOCF_M_CITY         (0x00008)   /* 'c' City */
+#define LOCF_M_MASK         (0x0000F)
 
-#define LOCF_T_SHRINE       (0x0010)    /* 'S' Raceshrine */
-#define LOCF_T_GUILD        (0x0020)    /* 'G' Guild */
-#define LOCF_T_SS           (0x0040)    /* 'P' Player guild/Secret Society */
-#define LOCF_T_MONSTER      (0x0080)    /* 'M' Special monster */
-#define LOCF_T_TRAINER      (0x0100)    /* 'T' Guild trainer */
-#define LOCF_T_FORT         (0x0200)    /* 'F' Regions fort */
-#define LOCF_T_MASK         (0x0FF0)
+/* Location types */
+#define LOCF_T_SHRINE       (0x00010)   /* 'S' Raceshrine */
+#define LOCF_T_GUILD        (0x00020)   /* 'G' Guild */
+#define LOCF_T_SS           (0x00040)   /* 'P' Player guild/Secret Society */
+#define LOCF_T_MONSTER      (0x00080)   /* 'M' Special monster */
+#define LOCF_T_TRAINER      (0x00100)   /* 'T' Guild trainer */
+#define LOCF_T_FORT         (0x00200)   /* 'F' Regions fort */
+#define LOCF_T_MASK         (0x0FFF0)
 #define LOCF_MASK           (LOCF_M_MASK | LOCF_T_MASK)
 
-#define LOCF_INVIS          (0x1000)    /* '-' Invisible marker / Don't show label */
-#define LOCF_INVALID        (0x2000)    /* Possibly invalid location */
-#define LOCF_NOMARKER       (0x4000)    /* Location has no marker in mapdata or explicitly defined */
-#define LOCF_Q_MASK         (0xF000)
+/* Extra flags */
+#define LOCF_INVIS          (0x10000)   /* '-' Invisible marker / Don't show label */
+#define LOCF_CLOSED         (0x20000)   /* '!' Area is CLOSED */
+#define LOCF_INVALID        (0x40000)   /* Possibly invalid location */
+#define LOCF_NOMARKER       (0x80000)   /* Location has no marker in mapdata or explicitly defined */
+#define LOCF_Q_MASK         (0xF0000)
 
 
 /* Misc constants