[Freeciv-Dev] Re: (PR#12450) [C++] client/tilespec.h refers (again) to an enum constant out of scope

["Frédéric Brière" <fbriere@xxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12450 >

On Mon, Mar 07, 2005 at 02:00:52PM -0800, Jason Short wrote:
> > the struct tile_edge.  As usual, speak ye a name and a patch ye shalt
> > receive!
> 
> How about edge_type...

Thy will be done.


-- 
             Frédéric Brière    <*>    fbriere@xxxxxxxxxxx

 =>  <fbriere@xxxxxxxxxx> IS NO MORE:  <http://www.abacomsucks.com>  <=

Index: client/tilespec.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.h,v
retrieving revision 1.121
diff -u -r1.121 tilespec.h
--- client/tilespec.h   5 Mar 2005 23:51:05 -0000       1.121
+++ client/tilespec.h   7 Mar 2005 23:40:27 -0000
@@ -28,14 +28,15 @@
 
 /* An edge is the border between two tiles.  This structure represents one
  * edge.  The tiles are given in the same order as the enumeration name. */
+enum edge_type {
+  EDGE_NS, /* North and south */
+  EDGE_WE, /* West and east */
+  EDGE_UD, /* Up and down (nw/se), for hex_width tilesets */
+  EDGE_LR, /* Left and right (ne/sw), for hex_height tilesets */
+  EDGE_COUNT
+};
 struct tile_edge {
-  enum {
-    EDGE_NS, /* North and south */
-    EDGE_WE, /* West and east */
-    EDGE_UD, /* Up and down (nw/se), for hex_width tilesets */
-    EDGE_LR, /* Left and right (ne/sw), for hex_height tilesets */
-    EDGE_COUNT
-  } type;
+  enum edge_type type;
 #define NUM_EDGE_TILES 2
   const struct tile *tile[NUM_EDGE_TILES];
 };