Author: mir3x
Date: Tue Nov 29 12:59:48 2016
New Revision: 34655
URL: http://svn.gna.org/viewcvs/freeciv?rev=34655&view=rev
Log:
Notify client with popup_combat_info before battle happens
See patch #8029
Modified:
trunk/client/packhand.c
Modified: trunk/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=34655&r1=34654&r2=34655&view=diff
==============================================================================
--- trunk/client/packhand.c (original)
+++ trunk/client/packhand.c Tue Nov 29 12:59:48 2016
@@ -490,6 +490,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;
@@ -528,8 +530,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
