diff -urN -Xfreeciv/diff_ignore freeciv/server/plrhand.c freeciv-beta/server/plrhand.c --- freeciv/server/plrhand.c Wed Oct 9 16:10:17 2002 +++ freeciv-beta/server/plrhand.c Thu Oct 31 01:23:27 2002 @@ -1554,7 +1554,7 @@ sz_strlcpy(cplayer->username, cplayer->name); cplayer->is_connected = FALSE; cplayer->government = game.government_when_anarchy; - pplayer->revolution = 1; + cplayer->revolution = 1; cplayer->capital = TRUE; /* This should probably be DS_NEUTRAL when AI knows about diplomacy, @@ -1607,15 +1607,12 @@ } /* change the original player */ - - pplayer->government = game.government_when_anarchy; - pplayer->revolution = 1; - pplayer->economic.tax = PLAYER_DEFAULT_TAX_RATE; - pplayer->economic.science = PLAYER_DEFAULT_SCIENCE_RATE; - pplayer->economic.luxury = PLAYER_DEFAULT_LUXURY_RATE; + if (pplayer->government != game.government_when_anarchy) { + pplayer->government = game.government_when_anarchy; + pplayer->revolution = 1; + } pplayer->economic.gold = cplayer->economic.gold; pplayer->research.bulbs_researched = 0; - pplayer->turn_done = TRUE; /* Have other things to think about - paralysis*/ pplayer->embassy = 0; /* all embassys destroyed */ player_limit_to_government_rates(pplayer);