diff liblocfile.h @ 1770:cc59f80b0e78

Various cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 27 Oct 2017 04:35:51 +0300
parents 3f52fa562a46
children 7c254d090221
line wrap: on
line diff
--- a/liblocfile.h	Thu Oct 26 22:20:25 2017 +0300
+++ b/liblocfile.h	Fri Oct 27 04:35:51 2017 +0300
@@ -45,43 +45,43 @@
  */
 #define LOCF_NONE           (0x00000)
 
-/* Marker types */
-#define LOCF_M_SCENIC1      (0x000001)   /* '?' Scenic marker */
-#define LOCF_M_SCENIC2      (0x000002)   /* '%' Shrine marker/etc */
-#define LOCF_M_PCITY        (0x000004)   /* 'C' Player city */
-#define LOCF_M_CITY         (0x000008)   /* 'c' City */
+// Marker types
+#define LOCF_M_SCENIC1      (0x000001)   // '?' Scenic marker
+#define LOCF_M_SCENIC2      (0x000002)   // '%' Shrine marker/etc
+#define LOCF_M_PCITY        (0x000004)   // 'C' Player city
+#define LOCF_M_CITY         (0x000008)   // 'c' City
 #define LOCF_M_MASK         (0x00000F)
 
-/* Location types */
-#define LOCF_T_SHRINE       (0x000010)   /* 'S' Raceshrine */
-#define LOCF_T_GUILD        (0x000020)   /* 'G' Guild */
-#define LOCF_T_SS           (0x000040)   /* 'P' Player guild/Secret Society */
-#define LOCF_T_MONSTER      (0x000080)   /* 'M' Special monster */
-#define LOCF_T_TRAINER      (0x000100)   /* 'T' Guild trainer */
-#define LOCF_T_FORT         (0x000200)   /* 'F' Regions fort */
+// Location types
+#define LOCF_T_SHRINE       (0x000010)   // 'S' Raceshrine
+#define LOCF_T_GUILD        (0x000020)   // 'G' Guild
+#define LOCF_T_SS           (0x000040)   // 'P' Player guild/Secret Society
+#define LOCF_T_MONSTER      (0x000080)   // 'M' Special monster
+#define LOCF_T_TRAINER      (0x000100)   // 'T' Guild trainer
+#define LOCF_T_FORT         (0x000200)   // 'F' Regions fort
 #define LOCF_T_MASK         (0x00FFF0)
 #define LOCF_MASK           (LOCF_M_MASK | LOCF_T_MASK)
 
-/* Extra flags */
-#define LOCF_INVIS          (0x010000)   /* '-' Invisible marker / Don't show label */
-#define LOCF_CLOSED         (0x020000)   /* '!' Area is CLOSED */
-#define LOCF_INSTANCED      (0x040000)   /* 'I' Location is "instanced" for each player */
-#define LOCF_INVALID        (0x400000)   /* Possibly invalid location */
-#define LOCF_NOMARKER       (0x800000)   /* Location has no marker in mapdata or explicitly defined */
+// Extra flags
+#define LOCF_INVIS          (0x010000)   // '-' Invisible marker / Don't show label
+#define LOCF_CLOSED         (0x020000)   // '!' Area is CLOSED
+#define LOCF_INSTANCED      (0x040000)   // 'I' Location is "instanced" for each player
+#define LOCF_INVALID        (0x400000)   // Possibly invalid location
+#define LOCF_NOMARKER       (0x800000)   // Location has no marker in mapdata or explicitly defined
 #define LOCF_Q_MASK         (0xFF0000)
 
 
 /* Misc constants
  */
-#define LOC_MAX_NAMES       (64)        /* Probably more than enough? */
+#define LOC_MAX_NAMES       (64)        // Probably more than enough?
 #define LOC_MARKERS         "?%C"
 #define LOC_MAX_FILES       (64)
 
 
-#define NAME_ORIG           (0x00001)   /* '@' Original area name or coder */
-#define NAME_RECODER        (0x00002)   /* '!' Converter or recoder of area */
-#define NAME_MAINTAINER     (0x00004)   /* '%' Maintainer */
-#define NAME_EXPANDER       (0x00008)   /* '&' Expander, adding new things */
+#define NAME_ORIG           (0x00001)   // '@' Original area name or coder
+#define NAME_RECODER        (0x00002)   // '!' Converter or recoder of area
+#define NAME_MAINTAINER     (0x00004)   // '%' Maintainer
+#define NAME_EXPANDER       (0x00008)   // '&' Expander, adding new things
 
 
 /* Structures