[Freeciv-Dev] [PATCH] leftover unhappiness

["Mike Z. Jing" <jing@xxxxxxxxxxxxxxxxxxxxxxxxx>]

This is just a combination of two patches I submitted earlier.

With this patch, leftover unhappiness factors (mostly arise when
empire_size_inc is non-zero in government.ruleset) is no longer discarded
when all citizens in a city become unhappy.  They are now saved in a new
array ppl_residue[] and has to be dealt with first before any citizen in
that city can become content (or happy).

It also puts a cap on the luxuries actually usable by a city: twice the
city size.  Anything above this amount has no effect.  This is for Civ2
compatibility.

Note that it does NOT affect the gameplay under the default
rulesets.  So please apply if there are no bugs in the patch.

Mike

leftover_unhappiness.diff
Description: Text document