Author: cazfi
Date: Thu Jun 16 10:57:21 2016
New Revision: 32862
URL: http://svn.gna.org/viewcvs/freeciv?rev=32862&view=rev
Log:
Made property editor not to lose other game properties when editing
other one.
See bug #24627
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=32862&r1=32861&r2=32862&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/editprop.c (original)
+++ trunk/client/gui-gtk-2.0/editprop.c Thu Jun 16 10:57:21 2016
@@ -2341,8 +2341,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: trunk/client/gui-gtk-3.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/editprop.c?rev=32862&r1=32861&r2=32862&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/editprop.c (original)
+++ trunk/client/gui-gtk-3.0/editprop.c Thu Jun 16 10:57:21 2016
@@ -2342,8 +2342,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: trunk/client/gui-gtk-3.x/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/editprop.c?rev=32862&r1=32861&r2=32862&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/editprop.c (original)
+++ trunk/client/gui-gtk-3.x/editprop.c Thu Jun 16 10:57:21 2016
@@ -2342,8 +2342,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
