? diff
? bool_tag1.diff
? num_traderoutes1.diff
? num_traderoutes2.diff
? buy_info1.diff
? buy_info2.diff
? num_traderoutes3.diff
Index: client/packhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/packhand.c,v
retrieving revision 1.215
diff -u -r1.215 packhand.c
--- client/packhand.c	2002/02/12 09:36:44	1.215
+++ client/packhand.c	2002/02/16 15:44:39
@@ -384,7 +384,7 @@
 
   pcity->city_options=packet->city_options;
 
-  for (i=0;i<4;i++)  {
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     pcity->trade[i]=packet->trade[i];
     pcity->trade_value[i]=packet->trade_value[i];
   }
@@ -637,7 +637,7 @@
     pcity->ppl_elvis          = pcity->size;
     pcity->ppl_scientist      = 0;
     pcity->ppl_taxman         = 0;
-    for (i=0;i<4;i++)  {
+    for (i = 0; i < NUM_TRADEROUTES; i++) {
       pcity->trade[i]=0;
       pcity->trade_value[i]     = 0;
     }
Index: client/gui-gtk/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/citydlg.c,v
retrieving revision 1.118
diff -u -r1.118 citydlg.c
--- client/gui-gtk/citydlg.c	2002/02/12 09:36:45	1.118
+++ client/gui-gtk/citydlg.c	2002/02/16 15:44:42
@@ -2308,7 +2308,7 @@
 
   buf[0] = '\0';
 
-  for (i = 0; i < 4; i++) {
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     if (pdialog->pcity->trade[i]) {
       struct city *pcity;
       x = 1;
Index: client/gui-mui/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/citydlg.c,v
retrieving revision 1.41
diff -u -r1.41 citydlg.c
--- client/gui-mui/citydlg.c	2002/02/12 08:59:56	1.41
+++ client/gui-mui/citydlg.c	2002/02/16 15:44:43
@@ -697,7 +697,7 @@
 	     pdialog->pcity->name);
   bptr = end_of_strn(bptr, &nleft);
 
-  for (i = 0; i < 4; i++)
+  for (i = 0; i < NUM_TRADEROUTES; i++)
   {
     if (pdialog->pcity->trade[i])
     {
Index: client/gui-win32/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/citydlg.c,v
retrieving revision 1.11
diff -u -r1.11 citydlg.c
--- client/gui-win32/citydlg.c	2002/02/12 09:36:49	1.11
+++ client/gui-win32/citydlg.c	2002/02/16 15:44:45
@@ -1373,7 +1373,7 @@
   int x=0,total=0;
   char buf[512], *bptr=buf;
   int nleft = sizeof(buf);  
-  for(i=0; i<4; i++)
+  for (i = 0; i < NUM_TRADEROUTES; i++)
     if(pdialog->pcity->trade[i]) {
       struct city *pcity;
       x=1;
Index: client/gui-xaw/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/citydlg.c,v
retrieving revision 1.63
diff -u -r1.63 citydlg.c
--- client/gui-xaw/citydlg.c	2002/02/12 09:36:50	1.63
+++ client/gui-xaw/citydlg.c	2002/02/16 15:44:46
@@ -1455,7 +1455,7 @@
 	      pdialog->pcity->name);
   bptr = end_of_strn(bptr, &nleft);
   
-  for(i=0; i<4; i++)
+  for (i = 0; i < NUM_TRADEROUTES; i++)
     if(pdialog->pcity->trade[i]) {
       struct city *pcity;
       x=1;
Index: common/city.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/city.c,v
retrieving revision 1.144
diff -u -r1.144 city.c
--- common/city.c	2002/02/14 15:17:08	1.144
+++ common/city.c	2002/02/16 15:44:48
@@ -840,7 +840,7 @@
     return FALSE;
   }
 
-  for (i = 0; i < 4; i++) {
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     if (pc1->trade[i] == pc2->id || pc2->trade[i] == pc1->id) {
       /* cities already have a traderoute */
       return FALSE;
@@ -883,8 +883,9 @@
 **************************************************************************/
 int city_num_trade_routes(struct city *pcity)
 {
-  int i,n;
-  for(i=0,n=0; i<4; i++)
+  int i, n = 0;
+
+  for (i = 0; i < NUM_TRADEROUTES; i++)
     if(pcity->trade[i]) n++;
   
   return n;
@@ -1878,7 +1879,7 @@
 
   pcity->food_surplus = pcity->food_prod - pcity->size * 2;
 
-  for (i = 0; i < 4; i++) {
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     pcity->trade_value[i] =
 	trade_between_cities(pcity, find_city_by_id(pcity->trade[i]));
     pcity->trade_prod += pcity->trade_value[i];
Index: common/city.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/city.h,v
retrieving revision 1.98
diff -u -r1.98 city.h
--- common/city.h	2002/02/14 15:17:09	1.98
+++ common/city.h	2002/02/16 15:44:48
@@ -66,6 +66,11 @@
 
 #define INCITE_IMPOSSIBLE_COST (1000 * 1000 * 1000)
 
+/*
+ * Number of traderoutes a city can have.
+ */
+#define NUM_TRADEROUTES		4
+
 /* Iterate a city map */
 
 #define city_map_iterate(x, y)                     \
@@ -221,7 +226,7 @@
   int ppl_elvis, ppl_scientist, ppl_taxman;
 
   /* trade routes */
-  int trade[4],trade_value[4];
+  int trade[NUM_TRADEROUTES], trade_value[NUM_TRADEROUTES];
 
   /* the productions */
   int food_prod, food_surplus;
Index: common/packets.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.c,v
retrieving revision 1.179
diff -u -r1.179 packets.c
--- common/packets.c	2002/02/14 15:17:16	1.179
+++ common/packets.c	2002/02/16 15:44:51
@@ -2326,7 +2326,7 @@
   /* only 8 options allowed before need to extend protocol */
   cptr=put_uint8(cptr, req->city_options);
   
-  for(data=0;data<4;data++)  {
+  for (data = 0; data < NUM_TRADEROUTES; data++) {
     if(req->trade[data])  {
       cptr=put_uint16(cptr, req->trade[data]);
       cptr=put_uint8(cptr,req->trade_value[data]);
@@ -2419,14 +2419,15 @@
 
   iget_uint8(&iter, &packet->city_options);
 
-  for(data=0;data<4;data++)  {
+  for (data = 0; data < NUM_TRADEROUTES; data++) {
     if (pack_iter_remaining(&iter) < 3)
       break;
     iget_uint16(&iter, &packet->trade[data]);
     iget_uint8(&iter, &packet->trade_value[data]);
   }
-  for(;data<4;data++) packet->trade_value[data]=packet->trade[data]=0;
-
+  for (; data < NUM_TRADEROUTES; data++) {
+    packet->trade_value[data] = packet->trade[data] = 0;
+  }
   pack_iter_end(&iter, pc);
   remove_packet_from_buffer(pc->buffer);
   return packet;
Index: common/packets.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/common/packets.h,v
retrieving revision 1.103
diff -u -r1.103 packets.h
--- common/packets.h	2002/02/14 15:17:17	1.103
+++ common/packets.h	2002/02/16 15:44:51
@@ -338,7 +338,7 @@
   int food_prod, food_surplus;
   int shield_prod, shield_surplus;
   int trade_prod, tile_trade, corruption;
-  int trade[4],trade_value[4];
+  int trade[NUM_TRADEROUTES], trade_value[NUM_TRADEROUTES];
   int luxury_total, tax_total, science_total;
 
   /* the physics */
Index: server/citytools.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/citytools.c,v
retrieving revision 1.161
diff -u -r1.161 citytools.c
--- server/citytools.c	2002/02/14 15:17:24	1.161
+++ server/citytools.c	2002/02/16 15:44:54
@@ -685,7 +685,7 @@
   int i;
   struct city *oldtradecity;
 
-  for (i=0; i<4; i++) {
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     if (cities[i]) {
       oldtradecity = find_city_by_id(cities[i]);
       assert(oldtradecity != NULL);
@@ -746,7 +746,7 @@
   int i, no_units = 0;
   struct unit_list old_city_units;
   struct player *pgiver = city_owner(pcity);
-  int old_trade_routes[4];
+  int old_trade_routes[NUM_TRADEROUTES];
   bool had_palace = pcity->improvements[B_PALACE] != I_NONE;
 
   assert(pgiver != ptaker);
@@ -813,9 +813,9 @@
   }
 
   /* Update the city's trade routes. */
-  for (i=0; i<4; i++)
+  for (i = 0; i < NUM_TRADEROUTES; i++)
     old_trade_routes[i] = pcity->trade[i];
-  for (i = 0; i < 4; i++) {
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     struct city *pother_city = find_city_by_id(pcity->trade[i]);
 
     assert(pcity->trade[i] == 0 || pother_city != NULL);
@@ -830,7 +830,7 @@
    * Give the new owner infos about all cities which have a traderoute
    * with the transfered city.
    */
-  for (i = 0; i < 4; i++) {
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     struct city *pother_city = find_city_by_id(pcity->trade[i]);
     if (pother_city) {
       update_dumb_city(ptaker, pother_city);
@@ -929,7 +929,7 @@
   pcity->ppl_angry[4] = 0;
   pcity->was_happy = FALSE;
   pcity->steal=0;
-  for (i=0;i<4;i++)
+  for (i = 0; i < NUM_TRADEROUTES; i++)
     pcity->trade_value[i]=pcity->trade[i]=0;
   pcity->food_stock=0;
   pcity->shield_stock=0;
@@ -1127,7 +1127,7 @@
     goto MOVE_SEA_UNITS;
   } unit_list_iterate_end;
 
-  for (o = 0; o < 4; o++) {
+  for (o = 0; o < NUM_TRADEROUTES; o++) {
     struct city *pother_city = find_city_by_id(pcity->trade[o]);
 
     assert(pcity->trade[o] == 0 || pother_city != NULL);
@@ -1287,7 +1287,7 @@
 {
   int i;
 
-  for (i = 0; i < 4; i++) {
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     struct city *other = find_city_by_id(pcity->trade[i]);
     if (other && city_owner(other) == pplayer) {
       return TRUE;
@@ -1534,7 +1534,7 @@
   packet->ppl_elvis=pcity->ppl_elvis;
   packet->ppl_scientist=pcity->ppl_scientist;
   packet->ppl_taxman=pcity->ppl_taxman;
-  for (i=0;i<4;i++)  {
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     packet->trade[i]=pcity->trade[i];
     packet->trade_value[i]=pcity->trade_value[i];
   }
@@ -1643,7 +1643,7 @@
 
   assert(pc1 && pc2);
 
-  for (i = 0; i < 4; i++) {
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     if (pc1->trade[i] == pc2->id)
       pc1->trade[i] = 0;
     if (pc2->trade[i] == pc1->id)
@@ -1658,15 +1658,15 @@
 **************************************************************************/
 int establish_trade_route(struct city *pc1, struct city *pc2)
 {
-  int i;
-  int tb;
-  for (i=0;i<4;i++) {
+  int i, tb;
+
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     if (!pc1->trade[i]) {
       pc1->trade[i]=pc2->id;
       break;
     }
   }
-  for (i=0;i<4;i++) {
+  for (i = 0; i < NUM_TRADEROUTES; i++) {
     if (!pc2->trade[i]) {
       pc2->trade[i]=pc1->id;
       break;
Index: server/savegame.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/savegame.c,v
retrieving revision 1.55
diff -u -r1.55 savegame.c
--- server/savegame.c	2002/02/11 13:55:52	1.55
+++ server/savegame.c	2002/02/16 15:44:56
@@ -764,7 +764,7 @@
     pcity->ppl_taxman=secfile_lookup_int(file, "player%d.c%d.ntaxman",
 					 plrno, i);
 
-    for(j=0; j<4; j++)
+    for (j = 0; j < NUM_TRADEROUTES; j++)
       pcity->trade[j]=secfile_lookup_int(file, "player%d.c%d.traderoute%d",
 					 plrno, i, j);
     
@@ -1435,7 +1435,7 @@
 		       plrno, i);
     secfile_insert_int(file, pcity->ppl_taxman, "player%d.c%d.ntaxman", plrno, i);
 
-    for(j=0; j<4; j++)
+    for (j = 0; j < NUM_TRADEROUTES; j++)
       secfile_insert_int(file, pcity->trade[j], "player%d.c%d.traderoute%d", 
 			 plrno, i, j);
     
Index: server/unithand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/unithand.c,v
retrieving revision 1.215
diff -u -r1.215 unithand.c
--- server/unithand.c	2002/02/14 15:17:40	1.215
+++ server/unithand.c	2002/02/16 15:44:57
@@ -1175,7 +1175,7 @@
 		     _("Game: Sorry, your %s cannot establish"
 		       " a trade route here!"),
 		     unit_name(punit->type));
-    for (i=0;i<4;i++) {
+    for (i = 0; i < NUM_TRADEROUTES; i++) {
       if (pcity_homecity->trade[i]==pcity_dest->id) {
 	notify_player_ex(pplayer, pcity_dest->x, pcity_dest->y, E_NOEVENT,
 		      _("      A traderoute already exists between %s and %s!"),
@@ -1183,16 +1183,18 @@
 	return FALSE;
       }
     }
-    if (city_num_trade_routes(pcity_homecity)==4) {
+    if (city_num_trade_routes(pcity_homecity) == NUM_TRADEROUTES) {
       notify_player_ex(pplayer, pcity_dest->x, pcity_dest->y, E_NOEVENT,
-		       _("      The city of %s already has 4 trade routes!"),
-		       pcity_homecity->name);
+		       _("      The city of %s already has %d "
+			 "trade routes!"), pcity_homecity->name,
+		       NUM_TRADEROUTES);
       return FALSE;
     }
-    if (city_num_trade_routes(pcity_dest)==4) {
+    if (city_num_trade_routes(pcity_dest) == NUM_TRADEROUTES) {
       notify_player_ex(pplayer, pcity_dest->x, pcity_dest->y, E_NOEVENT,
-		       _("      The city of %s already has 4 trade routes!"),
-		       pcity_dest->name);
+		       _("      The city of %s already has %d "
+			 "trade routes!"), pcity_dest->name,
+		       NUM_TRADEROUTES);
       return FALSE;
     }
     return FALSE;