empserver/include
Markus Armbruster 4be4a2c540 update budget produce: Count loaded civilians for TECH_POP
When option TECH_POP is enabled, the cost of tech increases when
civilian population exceeds 50000.  Only civilians in old-owned
sectors count.  This differs from education and happiness, where
civilians loaded on ships and land units count, too.

The update counts population for TECH_POP with count_pop().  This is
an extra pass over all sectors.

produce also uses count_pop(), once per tech center examined.
Wasteful.

budget avoids count_pop(): it uses tax()'s civilian count.  More
efficient, but the difference to the update is ugly.

Change TECH_POP to use the same civilian count as education and
happiness, i.e. count civilians on ships and land units, too.

This count is available in nat_budget[] in time for produce(): it's
computed by tax() and by ship and land unit maintenance.  So use it
there.  This takes care of the update and budget.  produce doesn't run
enough update code to do the same.  Keep calling count_pop() there.
Update it to match the update, and give it internal linkage.
Duplicating update's workings there is ugly, so mark it FIXME.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2017-08-06 20:08:30 +02:00
..
actofgod.h Update copyright notice 2017-07-02 17:45:44 +02:00
chance.h Fix PRNG seeding to resist guessing 2013-05-08 06:55:21 +02:00
com.h Update copyright notice 2017-07-02 17:45:44 +02:00
combat.h Update copyright notice 2017-07-02 17:45:44 +02:00
commands.h Update copyright notice 2017-07-02 17:45:44 +02:00
commodity.h Update copyright notice 2017-07-02 17:45:44 +02:00
damage.h Update copyright notice 2017-07-02 17:45:44 +02:00
econfig-spec.h Update copyright notice 2017-07-02 17:45:44 +02:00
empio.h Update copyright notice 2017-07-02 17:45:44 +02:00
empobj.h empobj: Drop unused get_empobj_mob_max() 2017-08-06 19:59:59 +02:00
empthread.h Update copyright notice 2017-07-02 17:45:44 +02:00
file.h config: Add sect-chr flags, replace cost by flag "deity" 2017-08-06 19:59:58 +02:00
game.h Update copyright notice 2017-07-02 17:45:44 +02:00
ioqueue.h Update copyright notice 2017-07-02 17:45:44 +02:00
item.h collect: Derive collection value from power value 2017-08-06 19:59:59 +02:00
journal.h Update copyright notice 2017-07-02 17:45:44 +02:00
land.h config: Generalize unit build materials storage 2017-08-06 14:05:11 +02:00
loan.h Update copyright notice 2017-07-02 17:45:44 +02:00
lost.h Update copyright notice 2017-07-02 17:45:44 +02:00
lwp.h Update copyright notice 2017-07-02 17:45:44 +02:00
map.h Update copyright notice 2017-07-02 17:45:44 +02:00
match.h Update copyright notice 2017-07-02 17:45:44 +02:00
misc.h Update copyright notice 2017-07-02 17:45:44 +02:00
mission.h Update copyright notice 2017-07-02 17:45:44 +02:00
nat.h Update copyright notice 2017-07-02 17:45:44 +02:00
news.h Update copyright notice 2017-07-02 17:45:44 +02:00
nsc.h config: Add sect-chr flags, replace cost by flag "deity" 2017-08-06 19:59:58 +02:00
nuke.h config: Generalize unit build materials storage 2017-08-06 14:05:11 +02:00
optlist.h Update copyright notice 2017-07-02 17:45:44 +02:00
path.h Update copyright notice 2017-07-02 17:45:44 +02:00
plague.h Update copyright notice 2017-07-02 17:45:44 +02:00
plane.h config: Generalize unit build materials storage 2017-08-06 14:05:11 +02:00
player.h Update copyright notice 2017-07-02 17:45:44 +02:00
power.h Update copyright notice 2017-07-02 17:45:44 +02:00
product.h Update copyright notice 2017-07-02 17:45:44 +02:00
proto.h Update copyright notice 2017-07-02 17:45:44 +02:00
prototypes.h update budget produce: Count loaded civilians for TECH_POP 2017-08-06 20:08:30 +02:00
queue.h Update copyright notice 2017-07-02 17:45:44 +02:00
retreat.h Update copyright notice 2017-07-02 17:45:44 +02:00
sect.h collect: Derive collection value from power value 2017-08-06 19:59:59 +02:00
server.h Update copyright notice 2017-07-02 17:45:44 +02:00
service.h Update copyright notice 2017-07-02 17:45:44 +02:00
ship.h include: Bury dead remnants of TREATIES and SAIL 2017-08-06 19:59:59 +02:00
tel.h Update copyright notice 2017-07-02 17:45:44 +02:00
testing.h Update copyright notice 2017-07-02 17:45:44 +02:00
trade.h Update copyright notice 2017-07-02 17:45:44 +02:00
types.h include: Bury dead remnants of TREATIES and SAIL 2017-08-06 19:59:59 +02:00
unit.h Update copyright notice 2017-07-02 17:45:44 +02:00
update.h update budget produce: Count loaded civilians for TECH_POP 2017-08-06 20:08:30 +02:00
version.h Update copyright notice 2017-07-02 17:45:44 +02:00
xdump.h Update copyright notice 2017-07-02 17:45:44 +02:00
xy.h Update copyright notice 2017-07-02 17:45:44 +02:00