[ctp2-commit] Revision 902 committed by Martin G?\195?\188hmann

[ctp2-commit at darkdust.net]

Rations, workday, and wages add the happiness as they are supposed to do:

Some cleanings:
modified trunk/ctp2_code/ai/CityManagement/governor.cpp
modified trunk/ctp2_code/ai/ctpai.cpp
modified trunk/ctp2_code/ai/strategy/goals/Goal.cpp

Fixed happiness calculation according to rations, workday, and wages:
modified trunk/ctp2_code/gs/gameobj/Happy.cpp

U   trunk/ctp2_code/ai/CityManagement/governor.cpp
U   trunk/ctp2_code/ai/ctpai.cpp
U   trunk/ctp2_code/ai/strategy/goals/Goal.cpp
U   trunk/ctp2_code/gs/gameobj/Happy.cpp