Author: cazfi
Date: Tue Mar 11 22:47:59 2014
New Revision: 24651
URL: http://svn.gna.org/viewcvs/freeciv?rev=24651&view=rev
Log:
Updated network protocol to the fact that PACKET_SCENARIO_INFO never
needs to be sent from client to the server.
Reported by Jacob Nevins <jtn>
See bug #21348
Modified:
trunk/common/packets.def
trunk/fc_version
trunk/server/edithand.c
Modified: trunk/common/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=24651&r1=24650&r2=24651&view=diff
==============================================================================
--- trunk/common/packets.def (original)
+++ trunk/common/packets.def Tue Mar 11 22:47:59 2014
@@ -1756,7 +1756,7 @@
/****************** Scenario Related Packets ******************/
-PACKET_SCENARIO_INFO = 180; sc, cs, handle-via-packet, handle-per-conn
+PACKET_SCENARIO_INFO = 180; sc, handle-via-packet, handle-per-conn
BOOL is_scenario;
STRING name[256];
STRING description[MAX_LEN_PACKET];
Modified: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=24651&r1=24650&r2=24651&view=diff
==============================================================================
--- trunk/fc_version (original)
+++ trunk/fc_version Tue Mar 11 22:47:59 2014
@@ -52,7 +52,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-2014.Mar.11"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2014.Mar.11b"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
Modified: trunk/server/edithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/edithand.c?rev=24651&r1=24650&r2=24651&view=diff
==============================================================================
--- trunk/server/edithand.c (original)
+++ trunk/server/edithand.c Tue Mar 11 22:47:59 2014
@@ -1578,19 +1578,3 @@
save_game(name, "Scenario", TRUE);
}
-
-/****************************************************************************
- Handle scenario information packet
-****************************************************************************/
-void handle_scenario_info(struct connection *pc,
- const struct packet_scenario_info *packet)
-{
- game.scenario.is_scenario = packet->is_scenario;
- sz_strlcpy(game.scenario.name, packet->name);
- sz_strlcpy(game.scenario.description, packet->description);
- game.scenario.players = packet->players;
- game.scenario.startpos_nations = packet->startpos_nations;
-
- /* Send new info to everybody. */
- send_scenario_info(NULL);
-}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
