diff -urd -X freeciv.current/diff_ignore cma2/client/agents/citizen_management.c cma2.1/client/agents/citizen_management.c --- cma2/client/agents/citizen_management.c Thu Oct 4 17:40:56 2001 +++ cma2.1/client/agents/citizen_management.c Sat Oct 6 23:32:37 2001 @@ -633,8 +652,10 @@ p->surplus = result->surplus[SCIENCE]; p->is_valid = 1; } else { - assert(p->production == result->production[SCIENCE] && - p->surplus == result->surplus[SCIENCE]); + if (!result->disorder) { + assert(p->production == result->production[SCIENCE] && + p->surplus == result->surplus[SCIENCE]); + } } p = &cache2.secondary_stats[result->production[TRADE]][result->taxmans] @@ -644,8 +665,10 @@ p->surplus = result->surplus[GOLD]; p->is_valid = 1; } else { - assert(p->production == result->production[GOLD] && - p->surplus == result->surplus[GOLD]); + if (!result->disorder) { + assert(p->production == result->production[GOLD] && + p->surplus == result->surplus[GOLD]); + } } p = @@ -657,8 +680,10 @@ p->surplus = result->surplus[LUXURY]; p->is_valid = 1; } else { - assert(p->production == result->production[LUXURY] && - p->surplus == result->surplus[LUXURY]); + if (!result->disorder) { + assert(p->production == result->production[LUXURY] && + p->surplus == result->surplus[LUXURY]); + } } q =