Index: server/cityhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityhand.c,v
retrieving revision 1.41
diff -u -r1.41 cityhand.c
--- cityhand.c	1999/03/28 04:06:24	1.41
+++ cityhand.c	1999/04/09 22:01:26
@@ -346,36 +346,36 @@
   int cost, total;
   if (!pcity || !player_owns_city(pplayer, pcity)) return;
  
-  if (pcity->did_buy > 0) {
-    notify_player_ex(pplayer, pcity->x, pcity->y, E_NOEVENT,
+  if (pcity->did_buy) {
+    if (pcity->did_buy > 0) {
+      notify_player_ex(pplayer, pcity->x, pcity->y, E_NOEVENT,
 		  "Game: You have already bought this turn.");
-    return;
-  }
-
-  if (pcity->did_buy < 0) {
-    notify_player_ex(pplayer, pcity->x, pcity->y, E_NOEVENT,
+      return;
+    }
+    else {
+      notify_player_ex(pplayer, pcity->x, pcity->y, E_NOEVENT,
 		  "Game: Cannot buy in city created this turn.");
-    return;
-  }
-
-  if (!pcity->is_building_unit && pcity->currently_building==B_CAPITAL)  {
-    notify_player_ex(pplayer, pcity->x, pcity->y, E_NOEVENT,
-                     "Game: You don't buy Capitalization!");
-    return;
+      return;
+    }
   }
 
   if (!pcity->is_building_unit) {
+    if (pcity->currently_building==B_CAPITAL)  {
+      notify_player_ex(pplayer, pcity->x, pcity->y, E_NOEVENT,
+                       "Game: You don't buy Capitalization!");
+      return;
+    }
     total=improvement_value(pcity->currently_building);
     name=get_improvement_name(pcity->currently_building);
     
   } else {
-    name=unit_types[pcity->currently_building].name;
-    total=unit_value(pcity->currently_building);
     if (pcity->anarchy) {
       notify_player_ex(pplayer, pcity->x, pcity->y, E_NOEVENT, 
 		    "Game: Can't buy units when city is in disorder.");
       return;
     }
+    name=unit_types[pcity->currently_building].name;
+    total=unit_value(pcity->currently_building);
   }
   cost=city_buy_cost(pcity);
   if ((!cost) || (cost>pplayer->economic.gold))