Author: sveinung
Date: Tue Mar 10 13:09:01 2015
New Revision: 28484
URL: http://svn.gna.org/viewcvs/freeciv?rev=28484&view=rev
Log:
Add a new string field called name to the packet unit_do_action.
This is needed to make a future Found City action able to specify the name
of the new city.
See patch #5923
Modified:
trunk/ai/default/aiair.c
trunk/ai/default/aidiplomat.c
trunk/ai/default/aitools.c
trunk/ai/default/aiunit.c
trunk/client/control.c
trunk/common/packets.def
trunk/fc_version
trunk/server/unithand.c
trunk/server/unittools.c
Modified: trunk/ai/default/aiair.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aiair.c?rev=28484&r1=28483&r2=28484&view=diff
==============================================================================
--- trunk/ai/default/aiair.c (original)
+++ trunk/ai/default/aiair.c Tue Mar 10 13:09:01 2015
@@ -398,7 +398,7 @@
/* Choose capture. */
handle_unit_do_action(unit_owner(punit),
punit->id, tile_index(dst_tile),
- 0, ACTION_CAPTURE_UNITS);
+ 0, "", ACTION_CAPTURE_UNITS);
} else {
(void) unit_move_handling(punit, dst_tile, TRUE, FALSE);
}
Modified: trunk/ai/default/aidiplomat.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aidiplomat.c?rev=28484&r1=28483&r2=28484&view=diff
==============================================================================
--- trunk/ai/default/aidiplomat.c (original)
+++ trunk/ai/default/aidiplomat.c Tue Mar 10 13:09:01 2015
@@ -376,7 +376,7 @@
nation_rule_name(nation_of_unit(punit)), \
unit_rule_name(punit), punit->id, city_name(ctarget)); \
handle_unit_do_action(pplayer, punit->id, \
- ctarget->id, my_val, my_act); \
+ ctarget->id, my_val, "", my_act); \
return; \
}
@@ -695,7 +695,7 @@
ACTION_SPY_BRIBE_UNIT,
pvictim))) {
handle_unit_do_action(pplayer, punit->id,
- pvictim->id, -1,
+ pvictim->id, -1, "",
ACTION_SPY_BRIBE_UNIT);
/* autoattack might kill us as we move in */
if (game_unit_by_number(sanity) && punit->moves_left > 0) {
@@ -709,7 +709,7 @@
&& threat) {
/* don't stand around waiting for the final blow */
handle_unit_do_action(pplayer, punit->id,
- pvictim->id, -1,
+ pvictim->id, -1, "",
ACTION_SPY_SABOTAGE_UNIT);
/* autoattack might kill us as we move in */
if (game_unit_by_number(sanity) && punit->moves_left > 0) {
Modified: trunk/ai/default/aitools.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aitools.c?rev=28484&r1=28483&r2=28484&view=diff
==============================================================================
--- trunk/ai/default/aitools.c (original)
+++ trunk/ai/default/aitools.c Tue Mar 10 13:09:01 2015
@@ -847,7 +847,7 @@
punit, ptile)) {
/* Choose capture. */
handle_unit_do_action(unit_owner(punit), punit->id, tile_index(ptile),
- 0, ACTION_CAPTURE_UNITS);
+ 0, "", ACTION_CAPTURE_UNITS);
} else {
/* Regular attack. */
(void) unit_move_handling(punit, ptile, FALSE, FALSE);
Modified: trunk/ai/default/aiunit.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aiunit.c?rev=28484&r1=28483&r2=28484&view=diff
==============================================================================
--- trunk/ai/default/aiunit.c (original)
+++ trunk/ai/default/aiunit.c Tue Mar 10 13:09:01 2015
@@ -1938,7 +1938,7 @@
TILE_XY(unit_tile(punit)),
city_name(dest_city));
handle_unit_do_action(pplayer, punit->id, dest_city->id,
- 0, ACTION_HELP_WONDER);
+ 0, "", ACTION_HELP_WONDER);
} else if (is_action_enabled_unit_on_city(ACTION_TRADE_ROUTE,
punit, dest_city)) {
log_base(LOG_CARAVAN, "%s %s[%d](%d,%d) creates trade route in %s",
@@ -1948,7 +1948,7 @@
TILE_XY(unit_tile(punit)),
city_name(dest_city));
handle_unit_do_action(pplayer, punit->id, dest_city->id,
- 0, ACTION_TRADE_ROUTE);
+ 0, "", ACTION_TRADE_ROUTE);
} else if (is_action_enabled_unit_on_city(ACTION_MARKETPLACE,
punit, dest_city)) {
/* Get the one time bonus. */
@@ -1959,7 +1959,7 @@
TILE_XY(unit_tile(punit)),
city_name(dest_city));
handle_unit_do_action(pplayer, punit->id, dest_city->id,
- 0, ACTION_MARKETPLACE);
+ 0, "", ACTION_MARKETPLACE);
} else {
enum log_level level = LOG_NORMAL;
Modified: trunk/client/control.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/control.c?rev=28484&r1=28483&r2=28484&view=diff
==============================================================================
--- trunk/client/control.c (original)
+++ trunk/client/control.c Tue Mar 10 13:09:01 2015
@@ -1482,7 +1482,8 @@
int target_id, int value)
{
dsend_packet_unit_do_action(&client.conn,
- actor_id, target_id, value, action);
+ actor_id, target_id, value, "",
+ action);
}
/**************************************************************************
Modified: trunk/common/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=28484&r1=28483&r2=28484&view=diff
==============================================================================
--- trunk/common/packets.def (original)
+++ trunk/common/packets.def Tue Mar 10 13:09:01 2015
@@ -1005,6 +1005,7 @@
UNIT actor_id;
SINT32 target_id; # city_id, unit_id or tile_id
SINT16 value;
+ STRING name[MAX_LEN_NAME];
GEN_ACTION action_type;
end
Modified: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=28484&r1=28483&r2=28484&view=diff
==============================================================================
--- trunk/fc_version (original)
+++ trunk/fc_version Tue Mar 10 13:09:01 2015
@@ -54,7 +54,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-2015.Mar.07"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2015.Mar.10"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
Modified: trunk/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=28484&r1=28483&r2=28484&view=diff
==============================================================================
--- trunk/server/unithand.c (original)
+++ trunk/server/unithand.c Tue Mar 10 13:09:01 2015
@@ -888,6 +888,7 @@
const int actor_id,
const int target_id,
const int value,
+ const char *name,
const enum gen_action action_type)
{
struct unit *actor_unit = player_unit_by_number(pplayer, actor_id);
Modified: trunk/server/unittools.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/unittools.c?rev=28484&r1=28483&r2=28484&view=diff
==============================================================================
--- trunk/server/unittools.c (original)
+++ trunk/server/unittools.c Tue Mar 10 13:09:01 2015
@@ -3994,7 +3994,7 @@
handle_unit_do_action(pplayer,
unitid, tile_city(dst_tile)->id,
- 0, ACTION_TRADE_ROUTE);
+ 0, "", ACTION_TRADE_ROUTE);
if (player_unit_by_number(pplayer, unitid)) {
cancel_orders(punit, " no trade route city");
notify_player(pplayer, unit_tile(punit), E_UNIT_ORDERS, ftc_server,
@@ -4022,7 +4022,7 @@
handle_unit_do_action(pplayer,
unitid,
tile_city(dst_tile)->id,
- 0, ACTION_HELP_WONDER);
+ 0, "", ACTION_HELP_WONDER);
if (player_unit_by_number(pplayer, unitid)) {
cancel_orders(punit, " no wonder city");
notify_player(pplayer, unit_tile(punit), E_UNIT_ORDERS, ftc_server,
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
