[Freeciv-Dev] Re: Pop cost patch (resending via bug system) (PR#897)

[Raimar Falke <hawk@xxxxxxxxxxxxxxxxxxxxxxx>]

On Thu, Aug 16, 2001 at 06:58:08AM -0700, Arien Malec wrote:
> OK, following the recent discussion on patch handling procedures, I'm
> re-resubmitting through the bug tracking system the pop cost patch that 
> Michael
> Kiermaier and I did back in March.
> 
> Patch is against CVS 1.12.1-devel, and applies cleanly as of Aug 16 2001
> 
> This patch does three things:
> 
> 1) Changes city_auto_remove_workers to city_reduce_size, with an argument for 
> #
> pop to reduce, and changes callers to use the new interface
> 
> RATIONALE: Old system required a manual city->size-- to be done before the 
> call
> to city_auto_remove_workers, which breaks encapsulation & is prone to error.
> Now we have one place where the full reduction gets done, and can support
> reductions of more than 1 without special casing things.
> 
> TODO: I haven't changed the nuke code, but I imagine that it could benefit 
> from
> a call to the new function.
> 
> 2) Adds a pop_cost variable to the units.ruleset and puts in place the
> infrastructure to make use of that variable (building units, and adding to
> cities)
> 
> 3) Adds an AddToCities flag to separate out the F_CITIES building behavior 
> from
> the ability to add to cites.

Can you add capabilities checks? Can you also change to formatting to
follow "indent -kr -i2"?

Otherwise the patch looks fine. It doesn't provide an immediate gain
but adds further flexibility.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 "The BeOS takes the best features from the major operating systems. 
  It's got the power and flexibility of Unix, the interface and ease 
  of use of the MacOS, and Minesweeper from Windows."