Author: sveinung
Date: Mon Oct 26 16:43:12 2015
New Revision: 30218
URL: http://svn.gna.org/viewcvs/freeciv?rev=30218&view=rev
Log:
Fix comments that talked about Spy/Diplomat
in code that show the action selection dialog for all actors.
Modified:
branches/S2_6/client/gui-gtk-2.0/action_dialog.c
branches/S2_6/client/gui-gtk-3.0/action_dialog.c
branches/S2_6/client/gui-qt/dialogs.cpp
branches/S2_6/client/gui-sdl/action_dialog.c
branches/S2_6/client/gui-sdl2/action_dialog.c
Modified: branches/S2_6/client/gui-gtk-2.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/action_dialog.c?rev=30218&r1=30217&r2=30218&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-2.0/action_dialog.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/action_dialog.c Mon Oct 26 16:43:12 2015
@@ -1097,7 +1097,7 @@
shl = choice_dialog_start(GTK_WINDOW(toplevel), astr_str(&title),
astr_str(&text));
- /* Spy/Diplomat acting against a city */
+ /* Unit acting against a city */
action_iterate(act) {
if (action_get_actor_kind(act) == AAK_UNIT
@@ -1111,7 +1111,7 @@
}
} action_iterate_end;
- /* Spy/Diplomat acting against a unit */
+ /* Unit acting against another unit */
action_iterate(act) {
if (action_get_actor_kind(act) == AAK_UNIT
Modified: branches/S2_6/client/gui-gtk-3.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/action_dialog.c?rev=30218&r1=30217&r2=30218&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/action_dialog.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/action_dialog.c Mon Oct 26 16:43:12 2015
@@ -1107,7 +1107,7 @@
shl = choice_dialog_start(GTK_WINDOW(toplevel), astr_str(&title),
astr_str(&text));
- /* Spy/Diplomat acting against a city */
+ /* Unit acting against a city */
action_iterate(act) {
if (action_get_actor_kind(act) == AAK_UNIT
@@ -1121,7 +1121,7 @@
}
} action_iterate_end;
- /* Spy/Diplomat acting against a unit */
+ /* Unit acting against another unit */
action_iterate(act) {
if (action_get_actor_kind(act) == AAK_UNIT
Modified: branches/S2_6/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/dialogs.cpp?rev=30218&r1=30217&r2=30218&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/dialogs.cpp (original)
+++ branches/S2_6/client/gui-qt/dialogs.cpp Mon Oct 26 16:43:12 2015
@@ -1315,7 +1315,7 @@
cd->target_id[ATK_UNIT] = IDENTITY_NUMBER_ZERO;
}
- /* Spy/Diplomat acting against a city */
+ /* Unit acting against a city */
/* Set the correct target for the following actions. */
qv2 = cd->target_id[ATK_CITY];
@@ -1332,7 +1332,7 @@
}
} action_iterate_end;
- /* Spy/Diplomat acting against a unit */
+ /* Unit acting against another unit */
/* Set the correct target for the following actions. */
qv2 = cd->target_id[ATK_UNIT];
Modified: branches/S2_6/client/gui-sdl/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/action_dialog.c?rev=30218&r1=30217&r2=30218&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/action_dialog.c (original)
+++ branches/S2_6/client/gui-sdl/action_dialog.c Mon Oct 26 16:43:12 2015
@@ -900,7 +900,7 @@
}
/* ---------- */
- /* Spy/Diplomat acting against a city */
+ /* Unit acting against a city */
action_iterate(act) {
if (action_get_actor_kind(act) == AAK_UNIT
@@ -913,7 +913,7 @@
}
} action_iterate_end;
- /* Spy/Diplomat acting against a unit */
+ /* Unit acting against another unit */
action_iterate(act) {
if (action_get_actor_kind(act) == AAK_UNIT
Modified: branches/S2_6/client/gui-sdl2/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/action_dialog.c?rev=30218&r1=30217&r2=30218&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/action_dialog.c (original)
+++ branches/S2_6/client/gui-sdl2/action_dialog.c Mon Oct 26 16:43:12 2015
@@ -904,7 +904,7 @@
}
/* ---------- */
- /* Spy/Diplomat acting against a city */
+ /* Unit acting against a city */
action_iterate(act) {
if (action_get_actor_kind(act) == AAK_UNIT
@@ -917,7 +917,7 @@
}
} action_iterate_end;
- /* Spy/Diplomat acting against a unit */
+ /* Unit acting against another unit */
action_iterate(act) {
if (action_get_actor_kind(act) == AAK_UNIT
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
