Mercurial > hg > batmud > maputils

changeset 1738:dfbe7ac6b8f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some variables.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 18 Oct 2017 14:16:33 +0300
parents 2b8841f9dbfd
children d5190e1a65dc
files colormap.c
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/colormap.c	Wed Oct 18 13:31:44 2017 +0300
+++ b/colormap.c	Wed Oct 18 14:16:33 2017 +0300
@@ -343,15 +343,15 @@
  */
 BOOL processData(FILE *inFile, FILE *outFile, CMapOutFormat *fmt)
 {
-    int k, c, p;
+    int k, currColor, prevColor;
 
-    c = p = -1;
+    currColor = prevColor = -1;
     while ((k = fgetc(inFile)) != EOF)
     {
         if (k == '\n')
         {
             if (fmt->putTagEOL(outFile))
-                c = -1;
+                currColor = -1;
         }
         else
         if (k == 0xff)
@@ -360,10 +360,10 @@
             int i;
 
             /* Location title mode */
-            if (p != -1 && (!fmt->supBackColor || p != optBackColor))
+            if (prevColor != -1 && (!fmt->supBackColor || prevColor != optBackColor))
                     fmt->putTagEnd(outFile);
 
-            c = p = -2;
+            currColor = prevColor = -2;
 
             /* Location marker tag */
             for (i = 0; i < MAXSTR && (k = fgetc(inFile)) != EOF;)
@@ -422,14 +422,14 @@
         }
         else
         {
-            c = muGetMapPieceColor(k, optUseOldFormat, optCityFormat);
-            if (c != p)
+            currColor = muGetMapPieceColor(k, optUseOldFormat, optCityFormat);
+            if (currColor != prevColor)
             {
-                if (p != -1 && (!fmt->supBackColor || p != optBackColor))
+                if (prevColor != -1 && (!fmt->supBackColor || prevColor != optBackColor))
                     fmt->putTagEnd(outFile);
 
-                if ((!fmt->supBackColor || c != optBackColor) && fmt->putTagStart)
-                    fmt->putTagStart(outFile, c);
+                if ((!fmt->supBackColor || currColor != optBackColor) && fmt->putTagStart)
+                    fmt->putTagStart(outFile, currColor);
 
                 fprintf(outFile, "%c", k);
             }
@@ -439,10 +439,10 @@
             }
         }
 
-        p = c;
+        prevColor = currColor;
     }
 
-    if (p != -1 && (!fmt->supBackColor || p != optBackColor))
+    if (prevColor != -1 && (!fmt->supBackColor || prevColor != optBackColor))
         fmt->putTagEnd(outFile);
 
     return TRUE;