Author: cazfi Date: Thu Feb 18 03:52:12 2016 New Revision: 31969 URL: http://svn.gna.org/viewcvs/freeciv?rev=31969&view=rev Log: Get player's current government in to the editor mode so it won't get zeroed when setting player state back from the editor.
See bug #24403 Modified: branches/S2_6/client/gui-gtk-2.0/editprop.c branches/S2_6/client/gui-gtk-3.0/editprop.c Modified: branches/S2_6/client/gui-gtk-2.0/editprop.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/editprop.c?rev=31969&r1=31968&r2=31969&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-2.0/editprop.c (original) +++ branches/S2_6/client/gui-gtk-2.0/editprop.c Thu Feb 18 03:52:12 2016 @@ -2308,6 +2308,7 @@ = TECH_KNOWN == research_invention_state(presearch, tech); } advance_index_iterate_end; packet->gold = pplayer->economic.gold; + packet->government = government_index(pplayer->government); /* TODO: Set more packet fields. */ } return; Modified: branches/S2_6/client/gui-gtk-3.0/editprop.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/editprop.c?rev=31969&r1=31968&r2=31969&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-3.0/editprop.c (original) +++ branches/S2_6/client/gui-gtk-3.0/editprop.c Thu Feb 18 03:52:12 2016 @@ -2309,6 +2309,7 @@ = TECH_KNOWN == research_invention_state(presearch, tech); } advance_index_iterate_end; packet->gold = pplayer->economic.gold; + packet->government = government_index(pplayer->government); /* TODO: Set more packet fields. */ } return; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits