Author: cazfi
Date: Thu Jun 16 10:57:31 2016
New Revision: 32863

URL: http://svn.gna.org/viewcvs/freeciv?rev=32863&view=rev
Log:
Made property editor not to lose other game properties when editing
other one.

See bug #24627

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=32863&r1=32862&r2=32863&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-2.0/editprop.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/editprop.c Thu Jun 16 10:57:31 2016
@@ -2337,8 +2337,11 @@
       sz_strlcpy(packet->scenario_name, pgame->scenario.name);
       sz_strlcpy(packet->scenario_authors, pgame->scenario.authors);
       sz_strlcpy(pd.game.desc->scenario_desc, 
pgame->scenario_desc.description);
+      packet->scenario_random = pgame->scenario.save_random;
       packet->scenario_players = pgame->scenario.players;
-      /* TODO: Set more packet fields. */
+      packet->startpos_nations = pgame->scenario.startpos_nations;
+      packet->prevent_new_cities = pgame->scenario.prevent_new_cities;
+      packet->lake_flooding = pgame->scenario.lake_flooding;
     }
     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=32863&r1=32862&r2=32863&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/editprop.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/editprop.c Thu Jun 16 10:57:31 2016
@@ -2338,8 +2338,11 @@
       sz_strlcpy(packet->scenario_name, pgame->scenario.name);
       sz_strlcpy(packet->scenario_authors, pgame->scenario.authors);
       sz_strlcpy(pd.game.desc->scenario_desc, 
pgame->scenario_desc.description);
+      packet->scenario_random = pgame->scenario.save_random;
       packet->scenario_players = pgame->scenario.players;
-      /* TODO: Set more packet fields. */
+      packet->startpos_nations = pgame->scenario.startpos_nations;
+      packet->prevent_new_cities = pgame->scenario.prevent_new_cities;
+      packet->lake_flooding = pgame->scenario.lake_flooding;
     }
     return;
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to