Complete.Org: Mailing Lists: Archives: freeciv-dev: September 2001:
[Freeciv-Dev] Re: [Patch] Multiple bonus tech patch
Home

[Freeciv-Dev] Re: [Patch] Multiple bonus tech patch

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: Josh Cogliati <jjc@xxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: freeciv-dev@xxxxxxxxxxx
Subject: [Freeciv-Dev] Re: [Patch] Multiple bonus tech patch
From: Raimar Falke <hawk@xxxxxxxxxxxxxxxxxxxxxxx>
Date: Fri, 7 Sep 2001 09:58:54 +0200
Reply-to: rf13@xxxxxxxxxxxxxxxxxxxxxx

On Thu, Sep 06, 2001 at 07:46:33PM -0600, Josh Cogliati wrote:
> On Thu, Sep 06, 2001 at 11:31:59PM +0200, Raimar Falke wrote:
> > This timing wasn't good. I have applied your old patch at Thu Sep 6
> > 19:48:13 2001 (GMT). Can you rediff your patch? You don't have to
> > introduce a new capability.
> Very bad.  I updated freeciv, saw that it wasn't in there and sent off the 
> diff.  
> Anyway attached is the diff that adds first_message's diffed off of freeciv
> that I checked out in the last hour.

> @@ -254,6 +255,7 @@
>  req1     = "Invention"
>  req2     = "Iron Working"
>  flags    = ""
> +first_message = _("Game: Nations tremble in fear of your new weapons.")

As pointed you this have to be removed.

> @@ -404,6 +406,8 @@
>  req1     = "Mysticism"
>  req2     = "Literacy"
>  flags    = "Bonus_Tech"
> +first_message = _("Game: Great philosophers from all the world join \
> +your civilization; you get an immediate advance.")

I would also remove the "Game: " prefix.

> +  if (was_first && advances[tech_found].first_message != NULL) {
> +    notify_player(plr,"%s",advances[tech_found].first_message);
> +  }
> +
>    if (bonus_tech_hack) {
> -    notify_player(plr, _("Game: Great scientists from all the world join "
> -                      "your civilization: you get an immediate advance."));
>      tech_researched(plr);
>    }

We have to print the default message if there is no first_message.

The client doesn't get the first_message. But I see no point in doing
so.

I can do these changes if you want. You can also resent a new patch.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 "On the eigth day, God started debugging"


[Prev in Thread] Current Thread [Next in Thread]