Mercurial > hg > batmud > maputils

changeset 1506:b91105ab4c1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename functions.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 07 Feb 2015 06:14:36 +0200
parents 155c87cda4b7
children 4a62701d805e
files liblocfile.c
diffstat 1 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/liblocfile.c	Sat Feb 07 06:11:24 2015 +0200
+++ b/liblocfile.c	Sat Feb 07 06:14:36 2015 +0200
@@ -199,7 +199,7 @@
 }
 
 
-static BOOL checkFlag(int flags, int mask, int flag)
+static BOOL locCheckFlag(int flags, int mask, int flag)
 {
     if (mask)
         return (flags & mask) == flag;
@@ -208,10 +208,10 @@
 }
 
 
-static BOOL checkMutex(LocFileInfo *f, int *flags, int mask, int flag)
+static BOOL locCheckMutex(LocFileInfo *f, int *flags, int mask, int flag)
 {
-    if (!checkFlag(*flags, mask, 0) &&
-        !checkFlag(*flags, mask, flag))
+    if (!locCheckFlag(*flags, mask, 0) &&
+        !locCheckFlag(*flags, mask, flag))
     {
         locPMErr(f, "Invalid flags setting.\n");
         return FALSE;
@@ -302,7 +302,7 @@
 }
 
 
-static BOOL parseFlags(LocFileInfo *f, int *flags)
+static BOOL locParseFlags(LocFileInfo *f, int *flags)
 {
     BOOL endFlags;
 
@@ -314,45 +314,45 @@
         {
             /* Scenic marker flags */
         case '?':
-            if (!checkMutex(f, flags, LOCF_M_MASK, LOCF_M_SCENIC1))
+            if (!locCheckMutex(f, flags, LOCF_M_MASK, LOCF_M_SCENIC1))
                 return FALSE;
             break;
         case '%':
-            if (!checkMutex(f, flags, LOCF_M_MASK, LOCF_M_SCENIC2))
+            if (!locCheckMutex(f, flags, LOCF_M_MASK, LOCF_M_SCENIC2))
                 return FALSE;
             break;
         case 'C':
-            if (!checkMutex(f, flags, LOCF_M_MASK, LOCF_M_PCITY))
+            if (!locCheckMutex(f, flags, LOCF_M_MASK, LOCF_M_PCITY))
                 return FALSE;
             break;
         case 'c':
-            if (!checkMutex(f, flags, LOCF_M_MASK, LOCF_M_CITY))
+            if (!locCheckMutex(f, flags, LOCF_M_MASK, LOCF_M_CITY))
                 return FALSE;
             break;
 
             /* Marker type flags */
         case 'S':
-            if (!checkMutex(f, flags, LOCF_T_MASK, LOCF_T_SHRINE))
+            if (!locCheckMutex(f, flags, LOCF_T_MASK, LOCF_T_SHRINE))
                 return FALSE;
             break;
         case 'G':
-            if (!checkMutex(f, flags, LOCF_T_MASK, LOCF_T_GUILD))
+            if (!locCheckMutex(f, flags, LOCF_T_MASK, LOCF_T_GUILD))
                 return FALSE;
             break;
         case 'P':
-            if (!checkMutex(f, flags, LOCF_T_MASK, LOCF_T_SS))
+            if (!locCheckMutex(f, flags, LOCF_T_MASK, LOCF_T_SS))
                 return FALSE;
             break;
         case 'M':
-            if (!checkMutex(f, flags, LOCF_T_MASK, LOCF_T_MONSTER))
+            if (!locCheckMutex(f, flags, LOCF_T_MASK, LOCF_T_MONSTER))
                 return FALSE;
             break;
         case 'T':
-            if (!checkMutex(f, flags, LOCF_T_MASK, LOCF_T_TRAINER))
+            if (!locCheckMutex(f, flags, LOCF_T_MASK, LOCF_T_TRAINER))
                 return FALSE;
             break;
         case 'F':
-            if (!checkMutex(f, flags, LOCF_T_MASK, LOCF_T_FORT))
+            if (!locCheckMutex(f, flags, LOCF_T_MASK, LOCF_T_FORT))
                 return FALSE;
             break;
 
@@ -450,7 +450,7 @@
     case 3:            /* Label orientation and flags */
         res = parseFieldInt(f, &marker->dir);
         if (res)
-            res = parseFlags(f, &marker->flags);
+            res = locParseFlags(f, &marker->flags);
 
         if (res)
         {