Author: mir3x
Date: Tue Nov 29 12:59:57 2016
New Revision: 34656

URL: http://svn.gna.org/viewcvs/freeciv?rev=34656&view=rev
Log:
Notify client with popup_combat_info before battle happens

See patch #8029

Modified:
    branches/S2_6/client/packhand.c

Modified: branches/S2_6/client/packhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/packhand.c?rev=34656&r1=34655&r2=34656&view=diff
==============================================================================
--- branches/S2_6/client/packhand.c     (original)
+++ branches/S2_6/client/packhand.c     Tue Nov 29 12:59:57 2016
@@ -477,6 +477,8 @@
   struct unit *punit1 = game_unit_by_number(defender_unit_id);
 
   if (punit0 && punit1) {
+    popup_combat_info(attacker_unit_id, defender_unit_id, attacker_hp,
+                      defender_hp, make_winner_veteran);
     if (tile_visible_mapcanvas(unit_tile(punit0)) &&
        tile_visible_mapcanvas(unit_tile(punit1))) {
       show_combat = TRUE;
@@ -515,8 +517,6 @@
       refresh_unit_mapcanvas(pwinner, unit_tile(pwinner), TRUE, FALSE);
     }
   }
-  popup_combat_info(attacker_unit_id, defender_unit_id, attacker_hp,
-                    defender_hp, make_winner_veteran);
 }
 
 /**************************************************************************


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

Reply via email to