Author: cazfi
Date: Thu Feb 18 03:52:05 2016
New Revision: 31968

URL: http://svn.gna.org/viewcvs/freeciv?rev=31968&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:
    trunk/client/gui-gtk-2.0/editprop.c
    trunk/client/gui-gtk-3.0/editprop.c
    trunk/client/gui-gtk-3.x/editprop.c

Modified: trunk/client/gui-gtk-2.0/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/editprop.c?rev=31968&r1=31967&r2=31968&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/editprop.c (original)
+++ trunk/client/gui-gtk-2.0/editprop.c Thu Feb 18 03:52:05 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: trunk/client/gui-gtk-3.0/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/editprop.c?rev=31968&r1=31967&r2=31968&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/editprop.c (original)
+++ trunk/client/gui-gtk-3.0/editprop.c Thu Feb 18 03:52:05 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;

Modified: trunk/client/gui-gtk-3.x/editprop.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/editprop.c?rev=31968&r1=31967&r2=31968&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/editprop.c (original)
+++ trunk/client/gui-gtk-3.x/editprop.c Thu Feb 18 03:52:05 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

Reply via email to