Author: jtn
Date: Tue Dec 29 01:54:01 2015
New Revision: 31250

URL: http://svn.gna.org/viewcvs/freeciv?rev=31250&view=rev
Log:
Rename new "city_transfered" signal to "city_transferred".

See gna bug #24232.

Modified:
    trunk/data/default/default.lua
    trunk/server/citytools.c
    trunk/server/diplhand.c
    trunk/server/diplomats.c
    trunk/server/plrhand.c
    trunk/server/scripting/script_server.c

Modified: trunk/data/default/default.lua
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/default/default.lua?rev=31250&r1=31249&r2=31250&view=diff
==============================================================================
--- trunk/data/default/default.lua      (original)
+++ trunk/data/default/default.lua      Tue Dec 29 01:54:01 2015
@@ -192,7 +192,7 @@
       _("The loss of %s has inspired partisans!"), city.name)
 end
 
-signal.connect("city_transfered", "default_make_partisans_callback")
+signal.connect("city_transferred", "default_make_partisans_callback")
 
 
 -- Notify player about the fact that disaster had no effect if that is

Modified: trunk/server/citytools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/citytools.c?rev=31250&r1=31249&r2=31250&view=diff
==============================================================================
--- trunk/server/citytools.c    (original)
+++ trunk/server/citytools.c    Tue Dec 29 01:54:01 2015
@@ -1963,7 +1963,7 @@
   }
 
   if (city_remains) {
-    script_server_signal_emit("city_transfered", 4,
+    script_server_signal_emit("city_transferred", 4,
                               API_TYPE_CITY, pcity,
                               API_TYPE_PLAYER, cplayer,
                               API_TYPE_PLAYER, pplayer,

Modified: trunk/server/diplhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/diplhand.c?rev=31250&r1=31249&r2=31250&view=diff
==============================================================================
--- trunk/server/diplhand.c     (original)
+++ trunk/server/diplhand.c     Tue Dec 29 01:54:01 2015
@@ -529,7 +529,7 @@
 
           if (transfer_city(pdest, pcity, -1, TRUE, TRUE, FALSE,
                             !is_barbarian(pdest))) {
-            script_server_signal_emit("city_transfered", 4,
+            script_server_signal_emit("city_transferred", 4,
                                       API_TYPE_CITY, pcity,
                                       API_TYPE_PLAYER, pgiver,
                                       API_TYPE_PLAYER, pdest,

Modified: trunk/server/diplomats.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/diplomats.c?rev=31250&r1=31249&r2=31250&view=diff
==============================================================================
--- trunk/server/diplomats.c    (original)
+++ trunk/server/diplomats.c    Tue Dec 29 01:54:01 2015
@@ -874,7 +874,7 @@
      are within one square of the city) to the new owner. */
   if (transfer_city(pplayer, pcity, 1, TRUE, TRUE, FALSE,
                     !is_barbarian(pplayer))) {
-    script_server_signal_emit("city_transfered", 4,
+    script_server_signal_emit("city_transferred", 4,
                               API_TYPE_CITY, pcity,
                               API_TYPE_PLAYER, cplayer,
                               API_TYPE_PLAYER, pplayer,

Modified: trunk/server/plrhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/plrhand.c?rev=31250&r1=31249&r2=31250&view=diff
==============================================================================
--- trunk/server/plrhand.c      (original)
+++ trunk/server/plrhand.c      Tue Dec 29 01:54:01 2015
@@ -159,7 +159,7 @@
          and raze buildings according to raze chance (also removes palace) */
       if (transfer_city(pcity->original, pcity, 3, TRUE, TRUE, TRUE,
                         TRUE)) {
-        script_server_signal_emit("city_transfered", 4,
+        script_server_signal_emit("city_transferred", 4,
                                   API_TYPE_CITY, pcity,
                                   API_TYPE_PLAYER, pplayer,
                                   API_TYPE_PLAYER, pcity->original,
@@ -204,7 +204,7 @@
     city_list_iterate_safe(pplayer->cities, pcity) {
       if (transfer_city(barbarians, pcity, -1, FALSE, FALSE, FALSE,
                         FALSE)) {
-        script_server_signal_emit("city_transfered", 4,
+        script_server_signal_emit("city_transferred", 4,
                                   API_TYPE_CITY, pcity,
                                   API_TYPE_PLAYER, pplayer,
                                   API_TYPE_PLAYER, barbarians,
@@ -2749,7 +2749,7 @@
                         _("%s declares allegiance to the %s."),
                         city_link(pcity),
                         nation_plural_for_player(cplayer));
-          script_server_signal_emit("city_transfered", 4,
+          script_server_signal_emit("city_transferred", 4,
                                   API_TYPE_CITY, pcity,
                                   API_TYPE_PLAYER, pplayer,
                                   API_TYPE_PLAYER, cplayer,

Modified: trunk/server/scripting/script_server.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/scripting/script_server.c?rev=31250&r1=31249&r2=31250&view=diff
==============================================================================
--- trunk/server/scripting/script_server.c      (original)
+++ trunk/server/scripting/script_server.c      Tue Dec 29 01:54:01 2015
@@ -388,10 +388,12 @@
                           API_TYPE_CITY, API_TYPE_PLAYER, API_TYPE_PLAYER);
 
   /* First player is former owner, second new one. */
-  luascript_signal_create(fcl_main, "city_transfered", 4,
-                          API_TYPE_CITY, API_TYPE_PLAYER, API_TYPE_PLAYER, 
API_TYPE_STRING);
-
-  /* Deprecated form of the 'city_transfered' signal for the case of conquest. 
*/
+  luascript_signal_create(fcl_main, "city_transferred", 4,
+                          API_TYPE_CITY, API_TYPE_PLAYER, API_TYPE_PLAYER,
+                          API_TYPE_STRING);
+
+  /* Deprecated form of the 'city_transferred' signal for the case of
+   * conquest. */
   luascript_signal_create(fcl_main, "city_lost", 3,
                           API_TYPE_CITY, API_TYPE_PLAYER, API_TYPE_PLAYER);
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to