Binary files freeciv-cvs/amiga/vbcc_68k/libamigaserver.dir and freeciv-mod/amiga/vbcc_68k/libamigaserver.dir differ
Binary files freeciv-cvs/amiga/vbcc_warpos/libamigaserver.dir and freeciv-mod/amiga/vbcc_warpos/libamigaserver.dir differ
diff -Nur -X no.freeciv freeciv-cvs/client/gui-mui/mapclass.c freeciv-mod/client/gui-mui/mapclass.c
--- freeciv-cvs/client/gui-mui/mapclass.c	Wed Sep 20 15:18:04 2000
+++ freeciv-mod/client/gui-mui/mapclass.c	Wed Sep 20 19:58:09 2000
@@ -2654,7 +2654,7 @@
 	{
 	  if (msg->flags & MADF_DRAWOBJECT)
 	  {
-	    DoMethod(o,MUIM_DrawBackground,x1,y1,x2-x1+1,y2-y1+1,0,0,0);
+	    DoMethod(o,MUIM_DrawBackground,x1,y1,x2-x1+1,y2-y1+1,x1,y1,0);
 	  }
 	}
       }
diff -Nur -X no.freeciv freeciv-cvs/client/gui-mui/scrollbuttonclass.c freeciv-mod/client/gui-mui/scrollbuttonclass.c
--- freeciv-cvs/client/gui-mui/scrollbuttonclass.c	Sun Aug 20 22:04:20 2000
+++ freeciv-mod/client/gui-mui/scrollbuttonclass.c	Wed Sep 20 20:17:43 2000
@@ -43,6 +43,7 @@
   if ((o = (Object *) DoSuperNew(cl, o,
   		ButtonFrame,
   		MUIA_InputMode,MUIV_InputMode_RelVerify,
+  		MUIA_Background, MUII_ButtonBack,
 		TAG_MORE, msg->ops_AttrList)))
   {
 /*    struct ScrollButton_Data *data = (struct ScrollButton_Data *) INST_DATA(cl, o);*/
diff -Nur -X no.freeciv freeciv-cvs/client/packhand.c freeciv-mod/client/packhand.c
--- freeciv-cvs/client/packhand.c	Fri Sep  8 16:41:20 2000
+++ freeciv-mod/client/packhand.c	Wed Sep 20 20:16:07 2000
@@ -229,6 +229,7 @@
   int i, x, y, city_is_new;
   struct city *pcity;
   int popup;
+  int update_descriptions=0;
 
   pcity=find_city_by_id(packet->id);
 
@@ -254,6 +255,14 @@
   }
   else {
     city_is_new=0;
+    if (strcmp(pcity->name,packet->name)) {
+      update_descriptions = 1 && draw_city_names;
+    }
+    if ((pcity->is_building_unit != packet->is_building_unit) ||
+	(pcity->currently_building != packet->currently_building)) {
+      update_descriptions |= 1 && draw_city_productions;
+    }
+
     assert(pcity->id == packet->id);
   }
   
@@ -291,7 +300,7 @@
   pcity->food_stock=packet->food_stock;
   pcity->shield_stock=packet->shield_stock;
   pcity->pollution=packet->pollution;
-    
+
   pcity->is_building_unit=packet->is_building_unit;
   pcity->currently_building=packet->currently_building;
   if (city_is_new)
@@ -326,6 +335,11 @@
            pcity->owner==game.player_idx) || packet->diplomat_investigate;
 
   handle_city_packet_common(pcity, city_is_new, popup);
+
+  /* update the descriptions if necessary */
+  if (update_descriptions) {
+    update_city_descriptions();
+  }
 }
 
 /**************************************************************************
@@ -403,6 +417,7 @@
 {
   struct city *pcity;
   int city_is_new;
+  int update_descriptions = 0;
 
   pcity=find_city_by_id(packet->id);
 
@@ -428,6 +443,10 @@
   }
   else {
     city_is_new=0;
+    if (strcmp(pcity->name,packet->name)) {
+      update_descriptions = 1 && draw_city_names;
+    }
+    
     assert(pcity->id == packet->id);
   }
 
@@ -495,6 +514,11 @@
   } /* Dumb values */
 
   handle_city_packet_common(pcity, city_is_new, 0);
+
+  /* update the descriptions if necessary */
+  if (update_descriptions) {
+    update_city_descriptions();
+  }
 }
 
 /**************************************************************************
Binary files freeciv-cvs/common/packets.mdbi and freeciv-mod/common/packets.mdbi differ