Preliminary cleanup of mapview_common

client/include/mapview_g.h

@@ -33,7 +33,6 @@ void dirty_rect(int canvas_x, int canvas_y, int pixel_width,
                 int pixel_height);
 void dirty_all(void);
 void flush_dirty(void);
-void gui_flush(void);
 
 void update_map_canvas_scrollbars(void);
 

client/mapview.cpp

@@ -528,21 +528,14 @@ void flush_dirty()
   } else {
     for (int i = 0; i < num_dirty_rects; i++) {
       mapview->repaint(dirty_rects[i].x() * mapview->scale(),
-        dirty_rects[i].y() * mapview->scale(),
+                       dirty_rects[i].y() * mapview->scale(),
                        dirty_rects[i].width() * mapview->scale(),
                        dirty_rects[i].height() * mapview->scale());
     }
   }
   num_dirty_rects = 0;
 }
 
-/**
-   Do any necessary synchronization to make sure the screen is up-to-date.
-   The canvas should have already been flushed to screen via flush_dirty -
-   all this function does is make sure the hardware has caught up.
- */
-void gui_flush(void) { queen()->mapview_wdg->update(); }
-
 /**
    Update (refresh) the locations of the mapview scrollbars (if it uses
    them).

client/mapview_common.cpp

@@ -661,7 +661,6 @@ void set_mapview_origin(float gui_x0, float gui_y0)
       base_set_mapview_origin(start_x + diff_x * (mytime / timing_sec),
                               start_y + diff_y * (mytime / timing_sec));
       flush_dirty();
-      gui_flush();
       frames++;
     } while (currtime < timing_sec);
 
@@ -1122,7 +1121,6 @@ void put_nuke_mushroom_pixmaps(struct tile *ptile)
   dirty_rect(canvas_x, canvas_y, mysprite->width(), mysprite->height());
 
   flush_dirty();
-  gui_flush();
 
   fc_usleep(1000000);
 
@@ -1650,7 +1648,6 @@ void decrease_unit_hp_smooth(struct unit *punit0, int hp0,
     }
 
     unqueue_mapview_updates(true);
-    gui_flush();
     anim_delay(gui_options.smooth_combat_step_msec);
   }
 
@@ -1683,7 +1680,6 @@ void decrease_unit_hp_smooth(struct unit *punit0, int hp0,
                  tileset_tile_height(tileset));
 
       flush_dirty();
-      gui_flush();
       anim_delay(gui_options.smooth_combat_step_msec);
     }
   }
@@ -1769,7 +1765,6 @@ void move_unit_map_canvas(struct unit *punit, struct tile *src_tile, int dx,
 
         // Flush.
         flush_dirty();
-        gui_flush();
 
         // Restore the backup.  It won't take effect until the next flush.
         p.begin(mapview.store);