Author: cazfi Date: Tue Nov 8 08:00:26 2016 New Revision: 34440 URL: http://svn.gna.org/viewcvs/freeciv?rev=34440&view=rev Log: Cleaned out remaining radar sprite code.
See patch #7949 Modified: trunk/client/gui-gtk-2.0/graphics.c trunk/client/gui-gtk-2.0/graphics.h trunk/client/gui-gtk-2.0/mapview.c trunk/client/gui-gtk-3.0/graphics.c trunk/client/gui-gtk-3.0/graphics.h trunk/client/gui-gtk-3.0/mapview.c trunk/client/gui-gtk-3.22/graphics.c trunk/client/gui-gtk-3.22/graphics.h trunk/client/gui-gtk-3.22/mapview.c trunk/client/gui-qt/graphics.cpp Modified: trunk/client/gui-gtk-2.0/graphics.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/graphics.c?rev=34440&r1=34439&r2=34440&view=diff ============================================================================== --- trunk/client/gui-gtk-2.0/graphics.c (original) +++ trunk/client/gui-gtk-2.0/graphics.c Tue Nov 8 08:00:26 2016 @@ -1,4 +1,4 @@ -/********************************************************************** +/*********************************************************************** Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -48,7 +48,6 @@ #include "graphics.h" struct sprite *intro_gfx_sprite; -struct sprite *radar_gfx_sprite; GdkCursor *fc_cursors[CURSOR_LAST][NUM_CURSOR_FRAMES]; @@ -144,10 +143,6 @@ { if (intro_gfx_sprite) { free_sprite(intro_gfx_sprite); - intro_gfx_sprite=NULL; - } - if (radar_gfx_sprite) { - free_sprite(radar_gfx_sprite); - radar_gfx_sprite=NULL; + intro_gfx_sprite = NULL; } } Modified: trunk/client/gui-gtk-2.0/graphics.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/graphics.h?rev=34440&r1=34439&r2=34440&view=diff ============================================================================== --- trunk/client/gui-gtk-2.0/graphics.h (original) +++ trunk/client/gui-gtk-2.0/graphics.h Tue Nov 8 08:00:26 2016 @@ -1,4 +1,4 @@ -/********************************************************************** +/*********************************************************************** Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,6 @@ enum direction8 facing); extern struct sprite *intro_gfx_sprite; -extern struct sprite *radar_gfx_sprite; /* This name is to avoid a naming conflict with a global 'cursors' * variable in GTK+-2.6. See PR#12459. */ Modified: trunk/client/gui-gtk-2.0/mapview.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/mapview.c?rev=34440&r1=34439&r2=34440&view=diff ============================================================================== --- trunk/client/gui-gtk-2.0/mapview.c (original) +++ trunk/client/gui-gtk-2.0/mapview.c Tue Nov 8 08:00:26 2016 @@ -324,12 +324,6 @@ gboolean overview_canvas_expose(GtkWidget *w, GdkEventExpose *ev, gpointer data) { if (!can_client_change_view()) { - if (radar_gfx_sprite) { - gdk_draw_drawable(overview_canvas->window, civ_gc, - radar_gfx_sprite->pixmap, ev->area.x, ev->area.y, - ev->area.x, ev->area.y, - ev->area.width, ev->area.height); - } return TRUE; } Modified: trunk/client/gui-gtk-3.0/graphics.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/graphics.c?rev=34440&r1=34439&r2=34440&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/graphics.c (original) +++ trunk/client/gui-gtk-3.0/graphics.c Tue Nov 8 08:00:26 2016 @@ -1,4 +1,4 @@ -/********************************************************************** +/*********************************************************************** Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +46,6 @@ #include "graphics.h" struct sprite *intro_gfx_sprite; -struct sprite *radar_gfx_sprite; GdkCursor *fc_cursors[CURSOR_LAST][NUM_CURSOR_FRAMES]; @@ -99,10 +98,6 @@ { if (intro_gfx_sprite) { free_sprite(intro_gfx_sprite); - intro_gfx_sprite=NULL; - } - if (radar_gfx_sprite) { - free_sprite(radar_gfx_sprite); - radar_gfx_sprite=NULL; + intro_gfx_sprite = NULL; } } Modified: trunk/client/gui-gtk-3.0/graphics.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/graphics.h?rev=34440&r1=34439&r2=34440&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/graphics.h (original) +++ trunk/client/gui-gtk-3.0/graphics.h Tue Nov 8 08:00:26 2016 @@ -1,4 +1,4 @@ -/********************************************************************** +/*********************************************************************** Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,7 +24,6 @@ #include "sprite.h" extern struct sprite *intro_gfx_sprite; -extern struct sprite *radar_gfx_sprite; /* This name is to avoid a naming conflict with a global 'cursors' * variable in GTK+-2.6. See PR#12459. */ Modified: trunk/client/gui-gtk-3.0/mapview.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/mapview.c?rev=34440&r1=34439&r2=34440&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/mapview.c (original) +++ trunk/client/gui-gtk-3.0/mapview.c Tue Nov 8 08:00:26 2016 @@ -324,12 +324,10 @@ gboolean overview_canvas_draw(GtkWidget *w, cairo_t *cr, gpointer data) { gpointer source = (can_client_change_view()) ? - (gpointer)gui_options.overview.window : (gpointer)radar_gfx_sprite; + (gpointer)gui_options.overview.window : NULL; if (source) { - cairo_surface_t *surface = (can_client_change_view()) ? - gui_options.overview.window->surface : - radar_gfx_sprite->surface; + cairo_surface_t *surface = gui_options.overview.window->surface; cairo_set_source_surface(cr, surface, 0, 0); cairo_paint(cr); Modified: trunk/client/gui-gtk-3.22/graphics.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/graphics.c?rev=34440&r1=34439&r2=34440&view=diff ============================================================================== --- trunk/client/gui-gtk-3.22/graphics.c (original) +++ trunk/client/gui-gtk-3.22/graphics.c Tue Nov 8 08:00:26 2016 @@ -46,7 +46,6 @@ #include "graphics.h" struct sprite *intro_gfx_sprite; -struct sprite *radar_gfx_sprite; GdkCursor *fc_cursors[CURSOR_LAST][NUM_CURSOR_FRAMES]; @@ -99,10 +98,6 @@ { if (intro_gfx_sprite) { free_sprite(intro_gfx_sprite); - intro_gfx_sprite=NULL; - } - if (radar_gfx_sprite) { - free_sprite(radar_gfx_sprite); - radar_gfx_sprite=NULL; + intro_gfx_sprite = NULL; } } Modified: trunk/client/gui-gtk-3.22/graphics.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/graphics.h?rev=34440&r1=34439&r2=34440&view=diff ============================================================================== --- trunk/client/gui-gtk-3.22/graphics.h (original) +++ trunk/client/gui-gtk-3.22/graphics.h Tue Nov 8 08:00:26 2016 @@ -24,7 +24,6 @@ #include "sprite.h" extern struct sprite *intro_gfx_sprite; -extern struct sprite *radar_gfx_sprite; /* This name is to avoid a naming conflict with a global 'cursors' * variable in GTK+-2.6. See PR#12459. */ Modified: trunk/client/gui-gtk-3.22/mapview.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/mapview.c?rev=34440&r1=34439&r2=34440&view=diff ============================================================================== --- trunk/client/gui-gtk-3.22/mapview.c (original) +++ trunk/client/gui-gtk-3.22/mapview.c Tue Nov 8 08:00:26 2016 @@ -338,12 +338,10 @@ gboolean overview_canvas_draw(GtkWidget *w, cairo_t *cr, gpointer data) { gpointer source = (can_client_change_view()) ? - (gpointer)gui_options.overview.window : (gpointer)radar_gfx_sprite; + (gpointer)gui_options.overview.window : NULL; if (source) { - cairo_surface_t *surface = (can_client_change_view()) ? - gui_options.overview.window->surface : - radar_gfx_sprite->surface; + cairo_surface_t *surface = gui_options.overview.window->surface; cairo_set_source_surface(cr, surface, 0, 0); cairo_paint(cr); Modified: trunk/client/gui-qt/graphics.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/graphics.cpp?rev=34440&r1=34439&r2=34440&view=diff ============================================================================== --- trunk/client/gui-qt/graphics.cpp (original) +++ trunk/client/gui-qt/graphics.cpp Tue Nov 8 08:00:26 2016 @@ -26,7 +26,6 @@ #include "graphics.h" static struct sprite *intro_gfx_sprite = NULL; -static struct sprite *radar_gfx_sprite = NULL; /**************************************************************************** Return whether the client supports given view type. @@ -51,8 +50,4 @@ free_sprite(intro_gfx_sprite); intro_gfx_sprite = NULL; } - if (radar_gfx_sprite) { - free_sprite(radar_gfx_sprite); - radar_gfx_sprite = NULL; - } } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits