Mercurial > hg > batmud > maputils

changeset 1739:d5190e1a65dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Factorize end tag checking to a function.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 18 Oct 2017 14:18:29 +0300
parents dfbe7ac6b8f4
children 8cf2c4688a84
files colormap.c
diffstat 1 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/colormap.c	Wed Oct 18 14:16:33 2017 +0300
+++ b/colormap.c	Wed Oct 18 14:18:29 2017 +0300
@@ -341,6 +341,13 @@
 
 /* Process a normal format input
  */
+void checkEndTag(FILE *outFile, CMapOutFormat *fmt, const int prevColor)
+{
+    if (prevColor != -1 && (!fmt->supBackColor || prevColor != optBackColor))
+        fmt->putTagEnd(outFile);
+}
+
+
 BOOL processData(FILE *inFile, FILE *outFile, CMapOutFormat *fmt)
 {
     int k, currColor, prevColor;
@@ -360,9 +367,7 @@
             int i;
 
             /* Location title mode */
-            if (prevColor != -1 && (!fmt->supBackColor || prevColor != optBackColor))
-                    fmt->putTagEnd(outFile);
-
+            checkEndTag(outFile, fmt, prevColor);
             currColor = prevColor = -2;
 
             /* Location marker tag */
@@ -425,8 +430,7 @@
             currColor = muGetMapPieceColor(k, optUseOldFormat, optCityFormat);
             if (currColor != prevColor)
             {
-                if (prevColor != -1 && (!fmt->supBackColor || prevColor != optBackColor))
-                    fmt->putTagEnd(outFile);
+                checkEndTag(outFile, fmt, prevColor);
 
                 if ((!fmt->supBackColor || currColor != optBackColor) && fmt->putTagStart)
                     fmt->putTagStart(outFile, currColor);
@@ -442,8 +446,7 @@
         prevColor = currColor;
     }
 
-    if (prevColor != -1 && (!fmt->supBackColor || prevColor != optBackColor))
-        fmt->putTagEnd(outFile);
+    checkEndTag(outFile, fmt, prevColor);
 
     return TRUE;
 }