[Freeciv-Dev] [2 x Patch] struct government + unit upkeep

[Sune Kirkeby <sune@xxxxxxxxxxxxx>]

Hi,

A recent thread here on freeciv-dev about the status of unit
rulesets inspired me to do some work, that resulted in two
almost separate patches.

Firstly is the "struct government" patch, which joins all the
information about a government in one struct, and creates an
array of these (hardcoded).

Second is the unit upkeep patch, which removes the hardcoded
unit upkeep costs, and replaces them with values from four new
fields in units.rulesets. (The fourth being a recently suggested
suggested gold upkeep cost).

The unit upkeep patch is still rough edged, the unit-row in the
client city-display is way off, but the totals seem to be right.
(Xaw client not tested at all).


About the two patches:  The patches are independent in what they
try to accomplish, but the upkeep patch depends on struct gov.
Also, struct gov has some extra fields that the upkeep patch uses.


Comments?  Should I continue these two patches, or are they
a waste of effort?

(If others agree that the patches are worthwhile I intend to
clean them up before even proprosing to put them in CVS, so
please ignore the rough edges for now).

Sune Kirkeby

freeciv-struct_government.diff
Description: Text document

freeciv-upkeep.diff
Description: Text document