[Freeciv-Dev] Re: embassy fix (please read all client authors) (PR#1862)

[Christian Knoke <chrisk@xxxxxxxx>]

On Wed, Aug 07, 2002 at 10:58:48AM +0000, Per I. Mathisen wrote:
> On Mon, 29 Jul 2002, Christian Knoke wrote:
> > This patch has some silly consequences which I'm not sure we really want:
> >
> > in F3 dialog: you can show Intelligence of your own nation
> >             you can have conference with yourself, but since
> >           you have no partner to conclude, you have to cancel
> >             to close the dialog
> 
> Fixed in the attached patch. Touches all clients (&& not all tested).

Works ok, but see comment below.

> 
> > in F11 dialog: after the rang shown you get the info which nation is best.
> >              Now, if you are first, your own nation is displayed here,
> >            repeating the info; confusing
> 
> I can't see that my patch is at fault here. Anyway, not fixed in this
> patch.

See attached patch.

> Yours
> Per

Christian

> Index: client/climisc.c
> ===================================================================
> RCS file: /home/freeciv/CVS/freeciv/client/climisc.c,v
> retrieving revision 1.99
> diff -u -r1.99 climisc.c
> --- client/climisc.c  2002/06/27 00:59:10     1.99
> +++ client/climisc.c  2002/08/07 10:53:31
> @@ -343,6 +343,7 @@
>  ***************************************************************************/
>  char *get_embassy_status(struct player *me, struct player *them)
>  {
> +  if (me == them) return "n/a";

I'd prefer: if (me == them) return "-"; here, or make it translatable.

>    if (player_has_embassy(me, them)) {
>      if (player_has_embassy(them, me))
>        return Q_("?embassy:Both");
[...]

-- 
Christian Knoke     * * *      http://www.enter.de/~c.knoke/
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.

demograph-fix.diff
Description: Text document