[Freeciv-Dev] (PR#3423) Clear city description

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

Here's an update of this patch, by Rafal with changed comments by me.

Raimar: are you still against the name 'clear_city_descriptions'?  Can
anyone think of anything better than 'prepare_show_city_descriptions'?

jason

Index: client/mapview_common.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/mapview_common.c,v
retrieving revision 1.30
diff -u -r1.30 mapview_common.c
--- client/mapview_common.c     2003/02/17 02:11:25     1.30
+++ client/mapview_common.c     2003/02/17 23:56:39
@@ -700,6 +700,8 @@
     return;
   }
 
+  clear_city_descriptions();
+
   get_mapview_dimensions(&map_view_x0, &map_view_y0, &map_win_width,
                         &map_win_height);
   map_tile_width = (map_win_width - 1) / NORMAL_TILE_WIDTH + 1;
Index: client/gui-gtk/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/mapview.c,v
retrieving revision 1.156
diff -u -r1.156 mapview.c
--- client/gui-gtk/mapview.c    2003/02/17 02:11:25     1.156
+++ client/gui-gtk/mapview.c    2003/02/17 23:56:40
@@ -916,6 +916,14 @@
 }
 
 /**************************************************************************
+  If necessary, clear the city descriptions out of the buffer.
+**************************************************************************/
+void clear_city_descriptions(void)
+{
+  /* Nothing to do */
+}
+
+/**************************************************************************
 ...
 **************************************************************************/
 void show_city_desc(struct city *pcity, int canvas_x, int canvas_y)
Index: client/gui-gtk-2.0/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/mapview.c,v
retrieving revision 1.44
diff -u -r1.44 mapview.c
--- client/gui-gtk-2.0/mapview.c        2003/02/17 02:11:25     1.44
+++ client/gui-gtk-2.0/mapview.c        2003/02/17 23:56:41
@@ -945,6 +945,14 @@
 }
 
 /**************************************************************************
+  If necessary, clear the city descriptions out of the buffer.
+**************************************************************************/
+void clear_city_descriptions(void)
+{
+  /* Nothing to do */
+}
+
+/**************************************************************************
 ...
 **************************************************************************/
 void show_city_desc(struct city *pcity, int canvas_x, int canvas_y)
Index: client/gui-sdl/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-sdl/mapview.c,v
retrieving revision 1.21
diff -u -r1.21 mapview.c
--- client/gui-sdl/mapview.c    2003/02/17 02:11:26     1.21
+++ client/gui-sdl/mapview.c    2003/02/17 23:56:42
@@ -704,6 +704,15 @@
   freelog(LOG_NORMAL, "MAPVIEW: update_city_descriptions : PORT ME");
 }
 
+
+/**************************************************************************
+  If necessary, clear the city descriptions out of the buffer.
+**************************************************************************/
+void clear_city_descriptions(void)
+{
+  /* Nothing to do */
+}
+
 /**************************************************************************
   Draw a description for the given city onto the surface.
 **************************************************************************/
Index: client/gui-stub/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-stub/mapview.c,v
retrieving revision 1.26
diff -u -r1.26 mapview.c
--- client/gui-stub/mapview.c   2003/02/07 08:35:03     1.26
+++ client/gui-stub/mapview.c   2003/02/17 23:56:43
@@ -243,6 +243,14 @@
 }
 
 /**************************************************************************
+  If necessary, clear the city descriptions out of the buffer.
+**************************************************************************/
+void clear_city_descriptions(void)
+{
+  /* PORTME */
+}
+
+/**************************************************************************
   Draw a cross-hair overlay on a tile.
 **************************************************************************/
 void put_cross_overlay_tile(int map_x, int map_y)
Index: client/gui-win32/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/mapview.c,v
retrieving revision 1.56
diff -u -r1.56 mapview.c
--- client/gui-win32/mapview.c  2003/02/17 02:11:26     1.56
+++ client/gui-win32/mapview.c  2003/02/17 23:56:43
@@ -703,6 +703,14 @@
 }
 
 /**************************************************************************
+  If necessary, clear the city descriptions out of the buffer.
+**************************************************************************/
+void clear_city_descriptions(void)
+{
+  /* Nothing to do */
+}
+
+/**************************************************************************
 
 **************************************************************************/
 void show_city_desc(struct city *pcity, int canvas_x, int canvas_y)
Index: client/gui-xaw/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/mapview.c,v
retrieving revision 1.123
diff -u -r1.123 mapview.c
--- client/gui-xaw/mapview.c    2003/02/17 02:11:26     1.123
+++ client/gui-xaw/mapview.c    2003/02/17 23:56:44
@@ -693,6 +693,14 @@
 }
 
 /**************************************************************************
+  If necessary, clear the city descriptions out of the buffer.
+**************************************************************************/
+void clear_city_descriptions(void)
+{
+  /* Nothing to do */
+}
+
+/**************************************************************************
 Draw at x = left of string, y = top of string.
 **************************************************************************/
 static void draw_shadowed_string(XFontStruct * font, GC font_gc,
Index: client/include/mapview_g.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/include/mapview_g.h,v
retrieving revision 1.31
diff -u -r1.31 mapview_g.h
--- client/include/mapview_g.h  2003/02/07 08:35:03     1.31
+++ client/include/mapview_g.h  2003/02/17 23:56:44
@@ -37,6 +37,7 @@
 void center_tile_mapcanvas(int x, int y);
 
 void show_city_desc(struct city *pcity, int canvas_x, int canvas_y);
+void clear_city_descriptions(void);
 
 void put_one_tile(int map_x, int map_y, int canvas_x, int canvas_y);
 void gui_map_put_tile_iso(int map_x, int map_y,