[Freeciv-Dev] Re: Apollo program correction

[Jeff Mallatt <jjm@xxxxxxxxxxxx>]

At 2000/03/18 19:45 , Thue Janus Kristensen wrote:
>On Sat, 18 Mar 2000, Tuomas Airaksinen wrote:
>> 
>> In civ2, apollo description goes this way:
>> 
>> " Apollo Program
>>   Allows the construction of spaceship improvements by ALL civilizations
and reveals
>>   the entire map. Effects do not expire."
>> 
>> So, I corrected this difference.
>> 
>> Different languages of po-files should be updated as well.
>> (please check again my english spelling in en_GB.po-update!!!
>> I can't ever be sure enough...)
>> 
>> Should be applied against 17.3.2k cvs version.

Changing the msgid part of a .po file is inappropriate.  These parts are
automatically generated from the source code by xgettext/msgmerge.  You
need to change the source, which in this case is the in three files
civ1/buildings.ruleset, civ2/buildings.ruleset, default/buildings.ruleset.

However, the "cities only" behavior is correct for Civ1.  So, we should
leave civ1/buildings.ruleset as is, and only change civ2/buildings.ruleset
and default/buildings.ruleset.

Likewise, we need to use the game.civstyle option to determine what to do
in the code, including adding a comment on this Civ1/2 difference to
stdinhand.c.

The attached patch does all of this.

>In the attached patch I have
>2) Made a fix to show_area that fixes a bug when fogofwar was off
(information
>about units was not sent) This was entirely my fault.

I split this out into a separate patch (will follow in a few moments).

apollo_fix-2.diff
Description: Text document

jjm