[Freeciv-Dev] Re: (PR#12841) city_luxury_need function

["Benoit Hudson" <bh@xxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12841 >

On Thu, Apr 21, 2005 at 07:36:11AM -0700, Per I. Mathisen wrote:
> Huh? Only the comment is wrong.
> 
> +    /* Find out how much luxuries we need to make everyone content. */
> +    result = MAX((angry * 2 + unhappy - happy) * HAPPY_COST, 0);

Oh, indeed.

A bigger problem is that we're doing this computation in a different
order than the city code does: we're doing luxuries last, rather than
first, which changes the effect improvements and wonders have on
happiness.

        -- Benoît