Author: cazfi
Date: Sat Jun 25 15:35:11 2016
New Revision: 33024
URL: http://svn.gna.org/viewcvs/freeciv?rev=33024&view=rev
Log:
Effectively reverted bug #21347 exposing 'have_resources' to the editor.
Modified:
branches/S2_6/client/gui-gtk-2.0/editprop.c
branches/S2_6/client/gui-gtk-3.0/editprop.c
branches/S2_6/common/packets.def
branches/S2_6/fc_version
branches/S2_6/server/edithand.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=33024&r1=33023&r2=33024&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-2.0/editprop.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/editprop.c Sat Jun 25 15:35:11 2016
@@ -373,8 +373,7 @@
OPID_GAME_SCENARIO_PLAYERS,
OPID_GAME_STARTPOS_NATIONS,
OPID_GAME_PREVENT_CITIES,
- OPID_GAME_LAKE_FLOODING,
- OPID_GAME_HAVE_RESOURCES
+ OPID_GAME_LAKE_FLOODING
};
enum object_property_flags {
@@ -1842,9 +1841,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;
default:
log_error("%s(): Unhandled request for value of property %d "
"(%s) from object of type \"%s\".", __FUNCTION__,
@@ -2347,7 +2343,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;
@@ -2601,9 +2596,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;
default:
break;
}
@@ -3049,7 +3041,6 @@
case OPID_GAME_STARTPOS_NATIONS:
case OPID_GAME_PREVENT_CITIES:
case OPID_GAME_LAKE_FLOODING:
- case OPID_GAME_HAVE_RESOURCES:
button = gtk_check_button_new();
g_signal_connect(button, "toggled",
G_CALLBACK(objprop_widget_toggle_button_changed), op);
@@ -3264,7 +3255,6 @@
case OPID_GAME_STARTPOS_NATIONS:
case OPID_GAME_PREVENT_CITIES:
case OPID_GAME_LAKE_FLOODING:
- case OPID_GAME_HAVE_RESOURCES:
button = objprop_get_child_widget(op, "checkbutton");
disable_gobject_callback(G_OBJECT(button),
G_CALLBACK(objprop_widget_toggle_button_changed));
@@ -4495,8 +4485,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);
return;
case NUM_OBJTYPES:
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=33024&r1=33023&r2=33024&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/editprop.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/editprop.c Sat Jun 25 15:35:11 2016
@@ -374,8 +374,7 @@
OPID_GAME_SCENARIO_PLAYERS,
OPID_GAME_STARTPOS_NATIONS,
OPID_GAME_PREVENT_CITIES,
- OPID_GAME_LAKE_FLOODING,
- OPID_GAME_HAVE_RESOURCES
+ OPID_GAME_LAKE_FLOODING
};
enum object_property_flags {
@@ -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;
default:
log_error("%s(): Unhandled request for value of property %d "
"(%s) from object of type \"%s\".", __FUNCTION__,
@@ -2348,7 +2344,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;
@@ -2602,9 +2597,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;
default:
break;
}
@@ -3065,7 +3057,6 @@
case OPID_GAME_STARTPOS_NATIONS:
case OPID_GAME_PREVENT_CITIES:
case OPID_GAME_LAKE_FLOODING:
- case OPID_GAME_HAVE_RESOURCES:
button = gtk_check_button_new();
gtk_widget_set_hexpand(button, TRUE);
gtk_widget_set_halign(button, GTK_ALIGN_END);
@@ -3282,7 +3273,6 @@
case OPID_GAME_STARTPOS_NATIONS:
case OPID_GAME_PREVENT_CITIES:
case OPID_GAME_LAKE_FLOODING:
- case OPID_GAME_HAVE_RESOURCES:
button = objprop_get_child_widget(op, "checkbutton");
disable_gobject_callback(G_OBJECT(button),
G_CALLBACK(objprop_widget_toggle_button_changed));
@@ -4535,8 +4525,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);
return;
case NUM_OBJTYPES:
Modified: branches/S2_6/common/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/packets.def?rev=33024&r1=33023&r2=33024&view=diff
==============================================================================
--- branches/S2_6/common/packets.def (original)
+++ branches/S2_6/common/packets.def Sat Jun 25 15:35:11 2016
@@ -1887,9 +1887,11 @@
BOOL save_random;
BOOL prevent_new_cities;
BOOL lake_flooding;
- BOOL have_resources;
BOOL handmade;
BOOL allow_ai_type_fallback;
+
+ /* Unused at client side. */
+ BOOL have_resources;
end
PACKET_SCENARIO_DESCRIPTION = 252; sc, handle-per-conn
@@ -2134,7 +2136,6 @@
BOOL startpos_nations;
BOOL prevent_new_cities;
BOOL lake_flooding;
- BOOL have_resources;
end
PACKET_EDIT_SCENARIO_DESC = 253; cs, handle-per-conn
Modified: branches/S2_6/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/fc_version?rev=33024&r1=33023&r2=33024&view=diff
==============================================================================
--- branches/S2_6/fc_version (original)
+++ branches/S2_6/fc_version Sat Jun 25 15:35:11 2016
@@ -55,7 +55,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-2.6-2016.Jun.20"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2016.Jun.25"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
Modified: branches/S2_6/server/edithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/edithand.c?rev=33024&r1=33023&r2=33024&view=diff
==============================================================================
--- branches/S2_6/server/edithand.c (original)
+++ branches/S2_6/server/edithand.c Sat Jun 25 15:35:11 2016
@@ -1446,11 +1446,6 @@
changed = TRUE;
}
- if (packet->have_resources != game.scenario.have_resources) {
- game.scenario.have_resources = packet->have_resources;
- changed = TRUE;
- }
-
if (changed) {
send_scenario_info(NULL);
send_game_info(NULL);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
