Author: cazfi
Date: Sat Nov 26 13:54:46 2016
New Revision: 34633

URL: http://svn.gna.org/viewcvs/freeciv?rev=34633&view=rev
Log:
Corrected the way gui-stub popup_combat_info() gets called through interface.

See bug #25328

Modified:
    branches/S2_6/client/gui-stub/dialogs.c
    branches/S2_6/client/gui_cbsetter.c

Modified: branches/S2_6/client/gui-stub/dialogs.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-stub/dialogs.c?rev=34633&r1=34632&r2=34633&view=diff
==============================================================================
--- branches/S2_6/client/gui-stub/dialogs.c     (original)
+++ branches/S2_6/client/gui-stub/dialogs.c     Sat Nov 26 13:54:46 2016
@@ -307,8 +307,8 @@
   Popup detailed information about battle or save information for
   some kind of statistics
 ***************************************************************************/
-void popup_combat_info(int attacker_unit_id, int defender_unit_id,
-                       int attacker_hp, int defender_hp,
-                       bool make_winner_veteran)
-{
-}
+void gui_popup_combat_info(int attacker_unit_id, int defender_unit_id,
+                           int attacker_hp, int defender_hp,
+                           bool make_winner_veteran)
+{
+}

Modified: branches/S2_6/client/gui_cbsetter.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui_cbsetter.c?rev=34633&r1=34632&r2=34633&view=diff
==============================================================================
--- branches/S2_6/client/gui_cbsetter.c (original)
+++ branches/S2_6/client/gui_cbsetter.c Sat Nov 26 13:54:46 2016
@@ -105,6 +105,7 @@
   funcs->editgui_tileset_changed = gui_editgui_tileset_changed;
   funcs->editgui_popdown_all = gui_editgui_popdown_all;
 
+  funcs->popup_combat_info = gui_popup_combat_info;
   funcs->update_timeout_label = gui_update_timeout_label;
   funcs->real_city_dialog_popup = gui_real_city_dialog_popup;
   funcs->real_city_dialog_refresh = gui_real_city_dialog_refresh;


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to