[Freeciv-Dev] Re: (PR#9539) duplicate diplomat messages

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

Per I. Mathisen wrote:
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=9539 >
> 
> On Thu, 29 Jul 2004, Jason Short wrote:
> 
>>In diplomats.c:1207 there are duplicated messages for defending
>>diplomats dying. But one of these messages checks if the city is NULL
>>and one does not. Which is correct?
> 
> 
> The first notify is to the player owning the diplomat, the later ones for
> the target player. The second gives you the name of the city the diplomat
> tried to target, the third does not. The fourth and fifth are similar, but
> are used if the diplomat does not gain veterancy.
> 
> I do not see any duplicate messages here.

Sorry, I had a patch that changed the line numbers.  The correct line is 
1164.

        notify_player_ex(cplayer, x, y, E_MY_DIPLOMAT_FAILED,
                         _("Game: Your %s has been eliminated defending %s"
                           " against a %s."), unit_name(punit->type),
                (pcity ? pcity->name : ""), unit_name(pdiplomat->type));
        notify_player_ex(pplayer, x, y, E_ENEMY_DIPLOMAT_FAILED,
                 _("Game: An enemy %s has been eliminated defending %s."),
                unit_name(punit->type), (pcity ? pcity->name : ""));

        notify_player_ex(cplayer, pcity->x, pcity->y, E_MY_DIPLOMAT_FAILED,
                         _("Game: Your %s has been eliminated defending"
                           " against a %s in %s."), unit_name(punit->type),
                         unit_name(pdiplomat->type), pcity->name);
        notify_player_ex(pplayer, pcity->x, pcity->y, E_ENEMY_DIPLOMAT_FAILED,
                         _("Game: An enemy %s has been eliminated defending"
                           " %s."), unit_name(punit->type), pcity->name);

jason