Update to Freeciv server r28484

jlertle · Mar 10, 2015 · f282a64 · f282a64
1 parent 4ff616a
commit f282a64
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/freeciv-web/src/main/webapp/javascript/action_dialog.js b/freeciv-web/src/main/webapp/javascript/action_dialog.js
@@ -282,6 +282,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_city['id'],
                     "value" : 0,
+                    "name" : "",
                     "action_type": ACTION_ESTABLISH_EMBASSY};
       send_request(JSON.stringify(packet));
 
@@ -295,6 +296,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_city['id'],
                     "value" : 0,
+                    "name" : "",
                     "action_type": ACTION_SPY_INVESTIGATE_CITY};
         send_request(JSON.stringify(packet));
 
@@ -308,6 +310,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_city['id'],
                     "value" : 0,
+                    "name" : "",
                     "action_type": ACTION_SPY_SABOTAGE_CITY};
         send_request(JSON.stringify(packet));
 
@@ -321,6 +324,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_city['id'],
                     "value" : encode_building_id(B_LAST),
+                    "name" : "",
                     "action_type": ACTION_SPY_STEAL_TECH};
       send_request(JSON.stringify(packet));
 
@@ -334,6 +338,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_city['id'],
                     "value" : A_UNSET,
+                    "name" : "",
                     "action_type": ACTION_SPY_STEAL_GOLD};
       send_request(JSON.stringify(packet));
 
@@ -359,6 +364,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_city['id'],
                     "value" : 0,
+                    "name" : "",
                     "action_type": ACTION_SPY_POISON};
       send_request(JSON.stringify(packet));
 
@@ -372,6 +378,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_city['id'],
                     "value" : 0,
+                    "name" : "",
                     "action_type": ACTION_TRADE_ROUTE};
       send_request(JSON.stringify(packet));
 
@@ -385,6 +392,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_city['id'],
                     "value" : 0,
+                    "name" : "",
                     "action_type": ACTION_MARKETPLACE};
       send_request(JSON.stringify(packet));
 
@@ -398,6 +406,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_city['id'],
                     "value" : 0,
+                    "name" : "",
                     "action_type": ACTION_HELP_WONDER};
       send_request(JSON.stringify(packet));
 
@@ -423,6 +432,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_unit['id'],
                     "value" : 0,
+                    "name" : "",
                     "action_type": ACTION_SPY_SABOTAGE_UNIT};
       send_request(JSON.stringify(packet));
 
@@ -436,6 +446,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_tile['index'],
                     "value" : 0,
+                    "name" : "",
                     "action_type": ACTION_CAPTURE_UNITS};
       send_request(JSON.stringify(packet));
 
@@ -449,6 +460,7 @@ function popup_action_selection(actor_unit, action_probabilities,
                     "actor_id" : actor_unit['id'],
                     "target_id": target_tile['index'],
                     "value" : 0,
+                    "name" : "",
                     "action_type": ACTION_MOVE};
       send_request(JSON.stringify(packet));
 
@@ -495,6 +507,7 @@ function popup_bribe_dialog(actor_unit, target_unit, cost)
                     "actor_id" : actor_unit['id'],
                     "target_id": target_unit['id'],
                     "value" : 0,
+                    "name" : "",
                     "action_type": ACTION_SPY_BRIBE_UNIT};
       send_request(JSON.stringify(packet));
       $(id).dialog('close');
@@ -557,6 +570,7 @@ function popup_incite_dialog(actor_unit, target_city, cost)
                                                "actor_id" : actor_unit['id'],
                                                "target_id": target_city['id'],
                                                "value" : 0,
+                                               "name" : "",
                                                "action_type": ACTION_SPY_INCITE_CITY};
                                  send_request(JSON.stringify(packet));
 

diff --git a/freeciv/patches/freeciv_web_all_packets_def_changes.patch b/freeciv/patches/freeciv_web_all_packets_def_changes.patch
@@ -195,12 +195,13 @@ diff -Nurd -X.diff_ignore freeciv/common/packets.def freeciv/common/packets.def
  end
 
  PACKET_UNIT_COMBAT_INFO = 65; sc, lsend
-@@ -1020,7 +1037,7 @@
+@@ -1020,8 +1037,8 @@
  PACKET_UNIT_DO_ACTION = 84; cs, dsend
    UNIT actor_id;
    SINT32 target_id;   # city_id, unit_id or tile_id
 -  SINT16 value;
 +  UINT32 value;
+   STRING name[MAX_LEN_NAME];
    GEN_ACTION action_type;
  end
 

diff --git a/freeciv/version.txt b/freeciv/version.txt
@@ -1,10 +1,10 @@
 # I keep previous version easily available here so I don't need to check
 # version history constantly when handling ruleset differences.
-# Previous:28419
-FCREV=28472
+# Previous:28472
+FCREV=28484
 FCBRANCH=trunk
 
-ORIGCAPSTR="+Freeciv.Devel-3.0-2015.Mar.07"
+ORIGCAPSTR="+Freeciv.Devel-3.0-2015.Mar.10"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are