Mercurial > hg > batmud > maputils

changeset 1503:13b8f4bb0b19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change locAddName() and locAddNew() API.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 07 Feb 2015 06:05:10 +0200
parents 7683341666c7
children 521f7f5726dc
files liblocfile.c liblocfile.h mkloc.c
diffstat 3 files changed, 9 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/liblocfile.c	Sat Feb 07 06:02:25 2015 +0200
+++ b/liblocfile.c	Sat Feb 07 06:05:10 2015 +0200
@@ -6,19 +6,20 @@
 #include "liblocfile.h"
 
 
-static void locAddName(LocName *dst, int *ndst, char *src[], const int nsrc)
+static void locAddName(LocName *dst, int *ndst, LocName *src, const int nsrc)
 {
-    if (src != NULL && src[nsrc] != NULL)
+    if (src != NULL && src[nsrc].name != NULL)
     {
         int flags = 0;
         int n = 0;
-        switch (src[nsrc][0]) {
+        switch (src[nsrc].name[0])
+        {
             case '@': n++; flags |= NAME_ORIG; break;
             case '!': n++; flags |= NAME_RECODER; break;
             case '%': n++; flags |= NAME_MAINTAINER; break;
             case '&': n++; flags |= NAME_EXPANDER; break;
         }
-        dst[*ndst].name = th_strdup(&src[nsrc][n]);
+        dst[*ndst].name = th_strdup(&(src[nsrc].name[n]));
         dst[*ndst].flags = flags;
         (*ndst)++;
     }
@@ -67,7 +68,7 @@
 
 
 BOOL locAddNew(MapLocations *l, int x, int y, int dir, int flags,
-    char **names, char **coders, DateStruct *added, BOOL valid,
+    LocName *names, LocName *coders, DateStruct *added, BOOL valid,
     const char *uri, const char *freeform, LocFileInfo *file)
 {
     LocMarker *tmp;
@@ -738,9 +739,6 @@
                 else
                 {
                     /* Add new location to our list */
-                    locAddNew(l, tmpX, tmpY, tmpOrient, tmpFlags,
-                              tmpLocNames, tmpCoderNames, &tmpTime,
-                              tmpTimeSet, tmpURI, tmpStr, f);
                     prevMode = parseMode;
                     parseMode = PM_IDLE;
                 }
--- a/liblocfile.h	Sat Feb 07 06:02:25 2015 +0200
+++ b/liblocfile.h	Sat Feb 07 06:05:10 2015 +0200
@@ -125,7 +125,7 @@
 /* Location file parsing and data handling
  */
 BOOL   locAddNew(MapLocations *l, int x, int y, int dir, int flags,
-         char **names, char **coders, DateStruct *added, BOOL valid,
+         LocName *names, LocName *coders, DateStruct *added, BOOL valid,
          const char *uri, const char *freeform, LocFileInfo *file);
 
 int    locFindByCoords(MapLocations *l, int x, int y, BOOL locTrue);
--- a/mkloc.c	Sat Feb 07 06:02:25 2015 +0200
+++ b/mkloc.c	Sat Feb 07 06:05:10 2015 +0200
@@ -367,7 +367,7 @@
         {
             if (strchr(optLocMarkers, dp[x]))
             {
-                char *tmpNames[LOC_MAX_NAMES];
+                LocName tmpNames[LOC_MAX_NAMES];
                 char tmpDesc[512];
                 int tmpFlags;
 
@@ -405,7 +405,7 @@
                         srcFile, numNewLoc);
                 }
                 memset(tmpNames, 0, sizeof(tmpNames));
-                tmpNames[0] = tmpDesc;
+                tmpNames[0].name = tmpDesc;
                 locAddNew(worldLoc, x, y, LOCD_NONE, tmpFlags,
                     tmpNames, NULL, NULL, FALSE, NULL, NULL, NULL);