Author: sveinung
Date: Fri Oct 7 14:11:55 2016
New Revision: 34040
URL: http://svn.gna.org/viewcvs/freeciv?rev=34040&view=rev
Log:
Put ACTION_EXPEL_UNIT in its proper location.
The GTK clients and the Qt client had "Expel Unit" listed under a comment
header for actions against all units at a tile. It is against a single unit.
See bug #25154
Modified:
trunk/client/gui-gtk-2.0/action_dialog.c
trunk/client/gui-gtk-3.0/action_dialog.c
trunk/client/gui-gtk-3.22/action_dialog.c
trunk/client/gui-qt/dialogs.cpp
Modified: trunk/client/gui-gtk-2.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/action_dialog.c?rev=34040&r1=34039&r2=34040&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/action_dialog.c (original)
+++ trunk/client/gui-gtk-2.0/action_dialog.c Fri Oct 7 14:11:55 2016
@@ -1292,11 +1292,11 @@
/* Unit acting against a unit target. */
[ACTION_SPY_BRIBE_UNIT] = (GCallback)diplomat_bribe_callback,
[ACTION_SPY_SABOTAGE_UNIT] = (GCallback)spy_sabotage_unit_callback,
+ [ACTION_EXPEL_UNIT] = (GCallback)expel_unit_callback,
[ACTION_HEAL_UNIT] = (GCallback)heal_unit_callback,
/* Unit acting against all units at a tile. */
[ACTION_CAPTURE_UNITS] = (GCallback)capture_units_callback,
- [ACTION_EXPEL_UNIT] = (GCallback)expel_unit_callback,
[ACTION_BOMBARD] = (GCallback)bombard_callback,
/* Unit acting against a tile. */
Modified: trunk/client/gui-gtk-3.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/action_dialog.c?rev=34040&r1=34039&r2=34040&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/action_dialog.c (original)
+++ trunk/client/gui-gtk-3.0/action_dialog.c Fri Oct 7 14:11:55 2016
@@ -1386,11 +1386,11 @@
/* Unit acting against a unit target. */
[ACTION_SPY_BRIBE_UNIT] = (GCallback)diplomat_bribe_callback,
[ACTION_SPY_SABOTAGE_UNIT] = (GCallback)spy_sabotage_unit_callback,
+ [ACTION_EXPEL_UNIT] = (GCallback)expel_unit_callback,
[ACTION_HEAL_UNIT] = (GCallback)heal_unit_callback,
/* Unit acting against all units at a tile. */
[ACTION_CAPTURE_UNITS] = (GCallback)capture_units_callback,
- [ACTION_EXPEL_UNIT] = (GCallback)expel_unit_callback,
[ACTION_BOMBARD] = (GCallback)bombard_callback,
/* Unit acting against a tile. */
Modified: trunk/client/gui-gtk-3.22/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/action_dialog.c?rev=34040&r1=34039&r2=34040&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.22/action_dialog.c (original)
+++ trunk/client/gui-gtk-3.22/action_dialog.c Fri Oct 7 14:11:55 2016
@@ -1380,11 +1380,11 @@
/* Unit acting against a unit target. */
[ACTION_SPY_BRIBE_UNIT] = (GCallback)diplomat_bribe_callback,
[ACTION_SPY_SABOTAGE_UNIT] = (GCallback)spy_sabotage_unit_callback,
+ [ACTION_EXPEL_UNIT] = (GCallback)expel_unit_callback,
[ACTION_HEAL_UNIT] = (GCallback)heal_unit_callback,
/* Unit acting against all units at a tile. */
[ACTION_CAPTURE_UNITS] = (GCallback)capture_units_callback,
- [ACTION_EXPEL_UNIT] = (GCallback)expel_unit_callback,
[ACTION_BOMBARD] = (GCallback)bombard_callback,
/* Unit acting against a tile. */
Modified: trunk/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=34040&r1=34039&r2=34040&view=diff
==============================================================================
--- trunk/client/gui-qt/dialogs.cpp (original)
+++ trunk/client/gui-qt/dialogs.cpp Fri Oct 7 14:11:55 2016
@@ -152,11 +152,11 @@
/* Unit acting against a unit target. */
action_function[ACTION_SPY_BRIBE_UNIT] = diplomat_bribe;
action_function[ACTION_SPY_SABOTAGE_UNIT] = spy_sabotage_unit;
+ action_function[ACTION_EXPEL_UNIT] = expel_unit;
action_function[ACTION_HEAL_UNIT] = heal_unit;
/* Unit acting against all units at a tile. */
action_function[ACTION_CAPTURE_UNITS] = capture_units;
- action_function[ACTION_EXPEL_UNIT] = expel_unit;
action_function[ACTION_BOMBARD] = bombard;
/* Unit acting against a tile. */
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
