[Freeciv-Dev] Re: (PR#13056) Fix requirements bug

["Per I. Mathisen" <per@xxxxxxxxxxx>]

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

On Sat, 14 May 2005, Per I. Mathisen wrote:
> An iterator starts as a vector and ends as a list...

I found five more of these... Someone been sloppy with copy&paste?

  - Per

Index: common/city.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/city.c,v
retrieving revision 1.346
diff -u -r1.346 city.c
--- common/city.c       11 May 2005 14:11:20 -0000      1.346
+++ common/city.c       14 May 2005 15:00:22 -0000
@@ -445,7 +445,7 @@
                          pcity->tile, NULL, NULL, NULL, preq)) {
       return FALSE;
     }
-  } requirement_list_iterate_end;
+  } requirement_vector_iterate_end;
   return TRUE;
 }
 
Index: common/improvement.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/improvement.c,v
retrieving revision 1.63
diff -u -r1.63 improvement.c
--- common/improvement.c        11 May 2005 14:11:21 -0000      1.63
+++ common/improvement.c        14 May 2005 15:00:23 -0000
@@ -310,7 +310,7 @@
         && !is_req_active(p, NULL, NULL, NULL, NULL, NULL, NULL, preq)) {
       return FALSE;
     }
-  } requirement_list_iterate_end;
+  } requirement_vector_iterate_end;
 
   /* Check for space part construction.  This assumes that space parts have
    * no other effects. */
@@ -390,7 +390,7 @@
         && !is_req_active(p, NULL, NULL, NULL, NULL, NULL, NULL, preq)) {
       return FALSE;
     }
-  } requirement_list_iterate_end;
+  } requirement_vector_iterate_end;
   /* FIXME: should check some "unchanging" reqs here - like if there's
    * a nation requirement, we can go ahead and check it now. */
 
Index: common/requirements.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/requirements.c,v
retrieving revision 1.25
diff -u -r1.25 requirements.c
--- common/requirements.c       11 May 2005 14:11:21 -0000      1.25
+++ common/requirements.c       14 May 2005 15:00:23 -0000
@@ -860,7 +860,7 @@
                       preq)) {
       return FALSE;
     }
-  } requirement_list_iterate_end;
+  } requirement_vector_iterate_end;
   return TRUE;
 }
 
Index: server/citytools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/citytools.c,v
retrieving revision 1.327
diff -u -r1.327 citytools.c
--- server/citytools.c  11 May 2005 14:11:21 -0000      1.327
+++ server/citytools.c  14 May 2005 15:00:23 -0000
@@ -2079,7 +2079,7 @@
                            get_improvement_name(impr), pcity->name,
                            impr_sell_gold(impr)); 
          }
-       } requirement_list_iterate_end;
+       } requirement_vector_iterate_end;
       } built_impr_iterate_end;
     }
   } adjc_iterate_end;
Index: server/cityturn.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityturn.c,v
retrieving revision 1.317
diff -u -r1.317 cityturn.c
--- server/cityturn.c   11 May 2005 14:57:09 -0000      1.317
+++ server/cityturn.c   14 May 2005 15:00:23 -0000
@@ -809,7 +809,7 @@
            }
            break;
          }
-       } requirement_list_iterate_end;
+       } requirement_vector_iterate_end;
        if (!known) {
          /* This shouldn't happen...
             FIXME: make can_build_improvement() return a reason enum. */