[Freeciv-Dev] (PR#6986) spy's city search costs 1/3 move point

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=6986 >

> [guest - Tue Dec 09 01:14:59 2003]:
> 
> > [raven@xxxxxxxxx - Mon Dec 08 09:45:44 2003]:
> > 
> > Hmm... not "free", but I bet it was phrazed that way in comparison to 
> > other diplomatic action, which tends to cost a whole turn and risk the 
> > life of the unit.
> 
> In german "kostenlos (without payment)" is clearly wrong.  I wouldn't
> mention any special feature within this dialog.  Once one knows about it
> this information is worthless, so it's IMO subject to documentation/help.

This patch removes the information from the button.

jason


Index: client/gui-gtk/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/dialogs.c,v
retrieving revision 1.133
diff -u -r1.133 dialogs.c
--- client/gui-gtk/dialogs.c    2004/01/12 16:59:16     1.133
+++ client/gui-gtk/dialogs.c    2004/01/17 17:05:50
@@ -1040,18 +1040,18 @@
       if(!diplomat_can_do_action(punit, DIPLOMAT_MOVE, dest_x, dest_y))
        message_dialog_button_set_sensitive(shl,"button5",FALSE);
     }else{
-       shl=popup_message_dialog(top_vbox, /*"spydialog"*/
-                               _("Choose Your Spy's Strategy"), buf,
-                               diplomat_close_callback, NULL,
-                             _("Establish _Embassy"), 
diplomat_embassy_callback, 0,
-                             _("_Investigate City (free)"), 
diplomat_investigate_callback, 0,
-                             _("_Poison City"), spy_poison_callback,0,
-                             _("Industrial _Sabotage"), 
spy_request_sabotage_list, 0,
-                             _("Steal _Technology"), spy_steal_popup, 0,
-                             _("Incite a _Revolt"), diplomat_incite_callback, 
0,
-                             _("_Keep moving"), diplomat_keep_moving_callback, 
0,
-                             _("_Cancel"), NULL, 0,
-                             0);
+       shl = popup_message_dialog(top_vbox, /*"spydialog"*/
+               _("Choose Your Spy's Strategy"), buf,
+               diplomat_close_callback, NULL,
+               _("Establish _Embassy"), diplomat_embassy_callback, 0,
+               _("_Investigate City"), diplomat_investigate_callback, 0,
+               _("_Poison City"), spy_poison_callback,0,
+               _("Industrial _Sabotage"), spy_request_sabotage_list, 0,
+               _("Steal _Technology"), spy_steal_popup, 0,
+               _("Incite a _Revolt"), diplomat_incite_callback, 0,
+               _("_Keep moving"), diplomat_keep_moving_callback, 0,
+               _("_Cancel"), NULL, 0,
+               0);
  
       if(!diplomat_can_do_action(punit, DIPLOMAT_EMBASSY, dest_x, dest_y))
        message_dialog_button_set_sensitive(shl,"button0",FALSE);
Index: client/gui-gtk-2.0/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/dialogs.c,v
retrieving revision 1.57
diff -u -r1.57 dialogs.c
--- client/gui-gtk-2.0/dialogs.c        2004/01/12 16:59:16     1.57
+++ client/gui-gtk-2.0/dialogs.c        2004/01/17 17:05:50
@@ -896,7 +896,7 @@
        shl = popup_message_dialog(GTK_WINDOW(toplevel),
        _("Choose Your Spy's Strategy"), buf,
        _("Establish _Embassy"), diplomat_embassy_callback, NULL,
-       _("_Investigate City (free)"), diplomat_investigate_callback, NULL,
+       _("_Investigate City"), diplomat_investigate_callback, NULL,
        _("_Poison City"), spy_poison_callback, NULL,
        _("Industrial _Sabotage"), spy_request_sabotage_list, NULL,
        _("Steal _Technology"), spy_steal_popup, NULL,
Index: client/gui-mui/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/dialogs.c,v
retrieving revision 1.53
diff -u -r1.53 dialogs.c
--- client/gui-mui/dialogs.c    2003/07/20 20:41:37     1.53
+++ client/gui-mui/dialogs.c    2004/01/17 17:05:50
@@ -793,7 +793,7 @@
 
       if(diplomat_can_do_action(punit, DIPLOMAT_INVESTIGATE, dest_x, dest_y))
       {
-       msg_dlg[i].label = _("_Investigate city (free)");
+       msg_dlg[i].label = _("_Investigate city");
        msg_dlg[i].function = (APTR)diplomat_investigate;
        msg_dlg[i].data = NULL;
        i++;
Index: client/gui-sdl/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-sdl/dialogs.c,v
retrieving revision 1.42
diff -u -r1.42 dialogs.c
--- client/gui-sdl/dialogs.c    2004/01/05 00:18:30     1.42
+++ client/gui-sdl/dialogs.c    2004/01/17 17:05:51
@@ -2486,8 +2486,8 @@
     if (diplomat_can_do_action(pUnit, DIPLOMAT_INVESTIGATE, target_x, 
target_y)) {
     
       create_active_iconlabel(pBuf, pWindow->dst, pStr,
-           spy ? _("Investigate City (free)") : _("Investigate City"),
-                           diplomat_investigate_callback );
+                             _("Investigate City"),
+                             diplomat_investigate_callback);
       pBuf->data.city = pCity;
       set_wstate(pBuf, FC_WS_NORMAL);
   
Index: client/gui-win32/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/dialogs.c,v
retrieving revision 1.40
diff -u -r1.40 dialogs.c
--- client/gui-win32/dialogs.c  2003/12/06 23:14:34     1.40
+++ client/gui-win32/dialogs.c  2004/01/17 17:05:51
@@ -1592,16 +1592,16 @@
       if(!diplomat_can_do_action(punit, DIPLOMAT_INCITE, dest_x, dest_y))
        message_dialog_button_set_sensitive(shl,4,FALSE);
     }else{
-       shl=popup_message_dialog(root_window, /*"spydialog"*/
-                               _("Choose Your Spy's Strategy"), buf,
-                             _("Establish _Embassy"), 
diplomat_embassy_callback, 0,
-                             _("_Investigate City (free)"), 
diplomat_investigate_callback, 0,
-                             _("_Poison City"), spy_poison_callback,0,
-                             _("Industrial _Sabotage"), 
spy_request_sabotage_list, 0,
-                             _("Steal _Technology"), spy_steal_popup, 0,
-                             _("Incite a _Revolt"), diplomat_incite_callback, 
0,
-                             _("_Cancel"), diplomat_cancel_callback, 0,
-                             0);
+       shl = popup_message_dialog(root_window, /*"spydialog"*/
+               _("Choose Your Spy's Strategy"), buf,
+               _("Establish _Embassy"), diplomat_embassy_callback, 0,
+               _("_Investigate City"), diplomat_investigate_callback, 0,
+               _("_Poison City"), spy_poison_callback,0,
+               _("Industrial _Sabotage"), spy_request_sabotage_list, 0,
+               _("Steal _Technology"), spy_steal_popup, 0,
+               _("Incite a _Revolt"), diplomat_incite_callback, 0,
+               _("_Cancel"), diplomat_cancel_callback, 0,
+               0);
  
       if(!diplomat_can_do_action(punit, DIPLOMAT_EMBASSY, dest_x, dest_y))
        message_dialog_button_set_sensitive(shl,0,FALSE);