[Freeciv-Dev] (PR#7606) misnamed field in tilespec.h

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=7606 >

The terrain drawing data contains a "blend" field.  This should be 
called "match" (it's for matching, not blending).  This is significant 
because a "blend" field may be introduced later...

jason

Index: client/tilespec.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.c,v
retrieving revision 1.146
diff -u -r1.146 tilespec.c
--- client/tilespec.c   27 Feb 2004 18:31:39 -0000      1.146
+++ client/tilespec.c   5 Mar 2004 22:56:39 -0000
@@ -1198,7 +1198,7 @@
       for (i = 0; i < NUM_DIRECTION_NSEW; i++) {
        my_snprintf(buffer1, sizeof(buffer1),
                    "t.%s_%s", draw->name, nsew_str(i));
-       draw->blend[i] = lookup_sprite_tag_alt(buffer1, "", TRUE,
+       draw->match[i] = lookup_sprite_tag_alt(buffer1, "", TRUE,
                                               "tile_type",
                                               tt->terrain_name);
       }
@@ -1219,7 +1219,7 @@
     }
 
     if (!draw->base) {
-      draw->base = draw->blend[0];
+      draw->base = draw->match[0];
     }
   }
 
@@ -1923,7 +1923,7 @@
       tileno = INDEX_NSEW(MATCH(DIR8_NORTH), MATCH(DIR8_SOUTH),
                          MATCH(DIR8_EAST), MATCH(DIR8_WEST));
 
-      ADD_SPRITE_SIMPLE(sprites.terrain[ttype]->blend[tileno]);
+      ADD_SPRITE_SIMPLE(sprites.terrain[ttype]->match[tileno]);
       if (!sprites.terrain[ttype]->is_layered) {
        *dither_count = 1;
       }
Index: client/tilespec.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.h,v
retrieving revision 1.55
diff -u -r1.55 tilespec.h
--- client/tilespec.h   27 Feb 2004 18:31:39 -0000      1.55
+++ client/tilespec.h   5 Mar 2004 22:56:39 -0000
@@ -109,7 +109,7 @@
   enum cell_type cell_type;
 
   struct Sprite *base;
-  struct Sprite *blend[NUM_DIRECTION_NSEW];
+  struct Sprite *match[NUM_DIRECTION_NSEW];
   struct Sprite *cells[8][4]; /* 4 = up down left right */
   struct Sprite *special[2];
   struct Sprite *mine;