Mercurial > hg > batmud > maputils

changeset 2350:4653f50e34c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update some loc-file marker descriptions and comments.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 27 Jul 2021 11:02:49 +0300
parents da0277ade8a7
children 8ea34967f06c
files README.loc src/liblocfile.h
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/README.loc	Tue Jul 27 10:50:33 2021 +0300
+++ b/README.loc	Tue Jul 27 11:02:49 2021 +0300
@@ -80,24 +80,24 @@
    may comprise of following:
 
    Marker types:
-     'c' = Major city
-     'C' = Player city
      '?' = Scenic
      '%' = Shrine scenic
+     'C' = Player city
+     'c' = Major city
 
    Location types:
      'S' = Raceshrine
      'G' = Guild
      'P' = Player guild/secret society
-     'M' = Monster
+     'M' = Special monster
      'T' = Guild-related Trainer
      'F' = Regional Fort
 
    Special flags:
-     '!' = Location is closed.
      '-' = Location is "invisible". Practically means that some operations
            of mkloc utility ignore this marker. In generated maps the marker
            itself MUST be placed, but label MUST NOT be drawn.
+     '!' = Location is CLOSED.
      'I' = Location is "instanced", e.g. usually personal for each player.
 
  * [REQ] Location name(s): The first name acts as UNIQUE identifier, but
--- a/src/liblocfile.h	Tue Jul 27 10:50:33 2021 +0300
+++ b/src/liblocfile.h	Tue Jul 27 11:02:49 2021 +0300
@@ -49,7 +49,7 @@
 #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_CITY         (0x000008)   // 'c' Major city
 #define LOCF_M_MASK         (0x00000F)
 
 // Location types
@@ -57,14 +57,14 @@
 #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_TRAINER      (0x000100)   // 'T' Guild-related trainer
+#define LOCF_T_FORT         (0x000200)   // 'F' Regional 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_CLOSED         (0x020000)   // '!' Location 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