[Freeciv-Dev] Re: (PR#7002) Re: core file on civserver, http://civserver.freeciv.org/games/252228

["Raimar Falke" <i-freeciv-lists@xxxxxxxxxxxxx>]

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

On Mon, Dec 01, 2003 at 10:10:19PM +0100, Mateusz Stefek wrote:
> 
> Dnia 2003.12.01 04:40, Jason Short napisa??(a):
> > 
> > <URL: http://rt.freeciv.org/Ticket/Display.html?id=7002 >
> > 
> > Raimar Falke wrote:
> > 
> > > This is a mistake caused by the delta patch.
> > 
> > Um, this patch just reverses a bugfix that was recently applied.
> > 
> (PR#6929)
> Strange, It wasn't my intention to crash CVS-HEAD. 
> 
> This is the patch that I proposed (It was made for S1_14):
> --- freeorig/server/diplhand.c        2003-02-27 23:56:04.000000000 +0100
> +++ freeciv-1.14/server/diplhand.c    2003-11-23 12:55:39.000000000 +0100
> @@ -253,6 +253,13 @@
>                         pcity->name);
>           goto cleanup;
>         }
> +       if (city_got_building(pcity,B_PALACE)) {
> +         notify_player(other,
> +                       _("Game: Your capital (%s) is requested, "
> +                         "you can't accept treaty."),
> +                       pcity->name);
> +         goto cleanup;
> +       }
>         break;
>       case CLAUSE_GOLD:
>         if (other->economic.gold < pclause->value) {
> 
> 
> Note that case CLAUSE_GOLD is placed after new code.
> Someone applied it "manually"  to CVS HEAD or /usr/bin/patch was to 
> "intelligent".

Per has already admitted that it is a copy-and-paste error on his
part.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 1 + 1 = 3, for large values of 1