Author: cazfi Date: Sat Jun 25 15:34:54 2016 New Revision: 33023 URL: http://svn.gna.org/viewcvs/freeciv?rev=33023&view=rev Log: Effectively reverted bug #21347 exposing 'have_resources' to the editor.
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 trunk/common/networking/packets.def trunk/fc_version trunk/server/edithand.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=33023&r1=33022&r2=33023&view=diff ============================================================================== --- trunk/client/gui-gtk-2.0/editprop.c (original) +++ trunk/client/gui-gtk-2.0/editprop.c Sat Jun 25 15:34:54 2016 @@ -374,7 +374,6 @@ OPID_GAME_STARTPOS_NATIONS, OPID_GAME_PREVENT_CITIES, OPID_GAME_LAKE_FLOODING, - OPID_GAME_HAVE_RESOURCES, OPID_GAME_RULESET_LOCKED }; @@ -1843,9 +1842,6 @@ case OPID_GAME_LAKE_FLOODING: pv->data.v_bool = pgame->scenario.lake_flooding; break; - case OPID_GAME_HAVE_RESOURCES: - pv->data.v_bool = pgame->scenario.have_resources; - break; case OPID_GAME_RULESET_LOCKED: pv->data.v_bool = pgame->scenario.ruleset_locked; break; @@ -2351,7 +2347,6 @@ packet->startpos_nations = pgame->scenario.startpos_nations; packet->prevent_new_cities = pgame->scenario.prevent_new_cities; packet->lake_flooding = pgame->scenario.lake_flooding; - packet->have_resources = pgame->scenario.have_resources; } return; @@ -2605,9 +2600,6 @@ case OPID_GAME_LAKE_FLOODING: packet->lake_flooding = pv->data.v_bool; return; - case OPID_GAME_HAVE_RESOURCES: - packet->have_resources = pv->data.v_bool; - return; case OPID_GAME_RULESET_LOCKED: packet->ruleset_locked = pv->data.v_bool; return; @@ -3056,7 +3048,6 @@ case OPID_GAME_STARTPOS_NATIONS: case OPID_GAME_PREVENT_CITIES: case OPID_GAME_LAKE_FLOODING: - case OPID_GAME_HAVE_RESOURCES: case OPID_GAME_RULESET_LOCKED: button = gtk_check_button_new(); g_signal_connect(button, "toggled", @@ -3272,7 +3263,6 @@ case OPID_GAME_STARTPOS_NATIONS: case OPID_GAME_PREVENT_CITIES: case OPID_GAME_LAKE_FLOODING: - case OPID_GAME_HAVE_RESOURCES: case OPID_GAME_RULESET_LOCKED: button = objprop_get_child_widget(op, "checkbutton"); disable_gobject_callback(G_OBJECT(button), @@ -4504,8 +4494,6 @@ OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); ADDPROP(OPID_GAME_LAKE_FLOODING, _("Saltwater Flooding Lakes"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); - ADDPROP(OPID_GAME_HAVE_RESOURCES, _("Save Resources"), - OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); ADDPROP(OPID_GAME_RULESET_LOCKED, _("Lock to current Ruleset"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); 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=33023&r1=33022&r2=33023&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/editprop.c (original) +++ trunk/client/gui-gtk-3.0/editprop.c Sat Jun 25 15:34:54 2016 @@ -375,7 +375,6 @@ OPID_GAME_STARTPOS_NATIONS, OPID_GAME_PREVENT_CITIES, OPID_GAME_LAKE_FLOODING, - OPID_GAME_HAVE_RESOURCES, OPID_GAME_RULESET_LOCKED }; @@ -1844,9 +1843,6 @@ case OPID_GAME_LAKE_FLOODING: pv->data.v_bool = pgame->scenario.lake_flooding; break; - case OPID_GAME_HAVE_RESOURCES: - pv->data.v_bool = pgame->scenario.have_resources; - break; case OPID_GAME_RULESET_LOCKED: pv->data.v_bool = pgame->scenario.ruleset_locked; break; @@ -2352,7 +2348,6 @@ packet->startpos_nations = pgame->scenario.startpos_nations; packet->prevent_new_cities = pgame->scenario.prevent_new_cities; packet->lake_flooding = pgame->scenario.lake_flooding; - packet->have_resources = pgame->scenario.have_resources; } return; @@ -2606,9 +2601,6 @@ case OPID_GAME_LAKE_FLOODING: packet->lake_flooding = pv->data.v_bool; return; - case OPID_GAME_HAVE_RESOURCES: - packet->have_resources = pv->data.v_bool; - return; case OPID_GAME_RULESET_LOCKED: packet->ruleset_locked = pv->data.v_bool; return; @@ -3072,7 +3064,6 @@ case OPID_GAME_STARTPOS_NATIONS: case OPID_GAME_PREVENT_CITIES: case OPID_GAME_LAKE_FLOODING: - case OPID_GAME_HAVE_RESOURCES: case OPID_GAME_RULESET_LOCKED: button = gtk_check_button_new(); gtk_widget_set_hexpand(button, TRUE); @@ -3290,7 +3281,6 @@ case OPID_GAME_STARTPOS_NATIONS: case OPID_GAME_PREVENT_CITIES: case OPID_GAME_LAKE_FLOODING: - case OPID_GAME_HAVE_RESOURCES: case OPID_GAME_RULESET_LOCKED: button = objprop_get_child_widget(op, "checkbutton"); disable_gobject_callback(G_OBJECT(button), @@ -4544,8 +4534,6 @@ OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); ADDPROP(OPID_GAME_LAKE_FLOODING, _("Saltwater Flooding Lakes"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); - ADDPROP(OPID_GAME_HAVE_RESOURCES, _("Save Resources"), - OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); ADDPROP(OPID_GAME_RULESET_LOCKED, _("Lock to current Ruleset"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); 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=33023&r1=33022&r2=33023&view=diff ============================================================================== --- trunk/client/gui-gtk-3.x/editprop.c (original) +++ trunk/client/gui-gtk-3.x/editprop.c Sat Jun 25 15:34:54 2016 @@ -375,7 +375,6 @@ OPID_GAME_STARTPOS_NATIONS, OPID_GAME_PREVENT_CITIES, OPID_GAME_LAKE_FLOODING, - OPID_GAME_HAVE_RESOURCES, OPID_GAME_RULESET_LOCKED }; @@ -1844,9 +1843,6 @@ case OPID_GAME_LAKE_FLOODING: pv->data.v_bool = pgame->scenario.lake_flooding; break; - case OPID_GAME_HAVE_RESOURCES: - pv->data.v_bool = pgame->scenario.have_resources; - break; case OPID_GAME_RULESET_LOCKED: pv->data.v_bool = pgame->scenario.ruleset_locked; break; @@ -2352,7 +2348,6 @@ packet->startpos_nations = pgame->scenario.startpos_nations; packet->prevent_new_cities = pgame->scenario.prevent_new_cities; packet->lake_flooding = pgame->scenario.lake_flooding; - packet->have_resources = pgame->scenario.have_resources; } return; @@ -2606,9 +2601,6 @@ case OPID_GAME_LAKE_FLOODING: packet->lake_flooding = pv->data.v_bool; return; - case OPID_GAME_HAVE_RESOURCES: - packet->have_resources = pv->data.v_bool; - return; case OPID_GAME_RULESET_LOCKED: packet->ruleset_locked = pv->data.v_bool; return; @@ -3072,7 +3064,6 @@ case OPID_GAME_STARTPOS_NATIONS: case OPID_GAME_PREVENT_CITIES: case OPID_GAME_LAKE_FLOODING: - case OPID_GAME_HAVE_RESOURCES: case OPID_GAME_RULESET_LOCKED: button = gtk_check_button_new(); gtk_widget_set_hexpand(button, TRUE); @@ -3290,7 +3281,6 @@ case OPID_GAME_STARTPOS_NATIONS: case OPID_GAME_PREVENT_CITIES: case OPID_GAME_LAKE_FLOODING: - case OPID_GAME_HAVE_RESOURCES: case OPID_GAME_RULESET_LOCKED: button = objprop_get_child_widget(op, "checkbutton"); disable_gobject_callback(G_OBJECT(button), @@ -4543,8 +4533,6 @@ OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); ADDPROP(OPID_GAME_LAKE_FLOODING, _("Saltwater Flooding Lakes"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); - ADDPROP(OPID_GAME_HAVE_RESOURCES, _("Save Resources"), - OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); ADDPROP(OPID_GAME_RULESET_LOCKED, _("Lock to current Ruleset"), OPF_IN_LISTVIEW | OPF_HAS_WIDGET | OPF_EDITABLE, VALTYPE_BOOL); return; Modified: trunk/common/networking/packets.def URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/networking/packets.def?rev=33023&r1=33022&r2=33023&view=diff ============================================================================== --- trunk/common/networking/packets.def (original) +++ trunk/common/networking/packets.def Sat Jun 25 15:34:54 2016 @@ -1930,10 +1930,12 @@ BOOL save_random; BOOL prevent_new_cities; BOOL lake_flooding; - BOOL have_resources; BOOL handmade; BOOL allow_ai_type_fallback; BOOL ruleset_locked; + + /* Unused at client side. */ + BOOL have_resources; end PACKET_SCENARIO_DESCRIPTION = 13; sc, handle-per-conn @@ -2172,7 +2174,6 @@ BOOL startpos_nations; BOOL prevent_new_cities; BOOL lake_flooding; - BOOL have_resources; BOOL ruleset_locked; end Modified: trunk/fc_version URL: http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=33023&r1=33022&r2=33023&view=diff ============================================================================== --- trunk/fc_version (original) +++ trunk/fc_version Sat Jun 25 15:34:54 2016 @@ -56,7 +56,7 @@ # - Avoid adding a new mandatory capability to the development branch for # as long as possible. We want to maintain network compatibility with # the stable branch for as long as possible. -NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Jun.20c" +NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Jun.25" NETWORK_CAPSTRING_OPTIONAL="" FREECIV_DISTRIBUTOR="" Modified: trunk/server/edithand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/edithand.c?rev=33023&r1=33022&r2=33023&view=diff ============================================================================== --- trunk/server/edithand.c (original) +++ trunk/server/edithand.c Sat Jun 25 15:34:54 2016 @@ -1395,11 +1395,6 @@ changed = TRUE; } - if (packet->have_resources != game.scenario.have_resources) { - game.scenario.have_resources = packet->have_resources; - changed = TRUE; - } - if (packet->ruleset_locked != game.scenario.ruleset_locked) { game.scenario.ruleset_locked = packet->ruleset_locked; changed = TRUE; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits