Author: cazfi
Date: Tue Mar  3 23:20:29 2015
New Revision: 28400

URL: http://svn.gna.org/viewcvs/freeciv?rev=28400&view=rev
Log:
Renamed "Extra Spreads" event as more generic "Extra Appears"

See patch #5879

Modified:
    trunk/common/events.c
    trunk/common/events.h
    trunk/data/misc/events.spec
    trunk/data/stdsounds.soundspec
    trunk/server/srv_main.c

Modified: trunk/common/events.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/events.c?rev=28400&r1=28399&r2=28400&view=diff
==============================================================================
--- trunk/common/events.c       (original)
+++ trunk/common/events.c       Tue Mar  3 23:20:29 2015
@@ -204,7 +204,7 @@
   GEN_EV(E_SCRIPT,             E_S_XYZZY,      N_("Scenario/ruleset script 
message")),
   /* TRANS: Event name for when the game year changes. */
   GEN_EV(E_NEXT_YEAR,          E_S_XYZZY,      N_("Year Advance")),
-  GEN_EV(E_EXTRA_SPREAD,        E_S_XYZZY,      N_("Extra Spreads")),
+  GEN_EV(E_EXTRA_APPEARS,       E_S_XYZZY,      N_("Extra Appears")),
   GEN_EV(E_UNIT_ILLEGAL_ACTION, E_S_UNIT,       N_("Unit Illegal Action"))
   /* The sound system also generates "e_game_quit", although there's no
    * corresponding identifier E_GAME_QUIT. */

Modified: trunk/common/events.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/events.h?rev=28400&r1=28399&r2=28400&view=diff
==============================================================================
--- trunk/common/events.h       (original)
+++ trunk/common/events.h       Tue Mar  3 23:20:29 2015
@@ -151,7 +151,7 @@
 #define SPECENUM_VALUE113 E_TECH_EMBASSY
 #define SPECENUM_VALUE114 E_MY_SPY_STEAL_GOLD
 #define SPECENUM_VALUE115 E_ENEMY_SPY_STEAL_GOLD
-#define SPECENUM_VALUE116 E_EXTRA_SPREAD
+#define SPECENUM_VALUE116 E_EXTRA_APPEARS
 #define SPECENUM_VALUE117 E_UNIT_ILLEGAL_ACTION
 /*
  * Note: If you add a new event, make sure you make a similar change

Modified: trunk/data/misc/events.spec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/events.spec?rev=28400&r1=28399&r2=28400&view=diff
==============================================================================
--- trunk/data/misc/events.spec (original)
+++ trunk/data/misc/events.spec Tue Mar  3 23:20:29 2015
@@ -102,5 +102,5 @@
   4,  9, "e_revolt_start"
   4, 10, "e_spaceship"
 
-  1, 2, "e_extra_spread"
+  1, 2,  "e_extra_appears"
 }

Modified: trunk/data/stdsounds.soundspec
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/stdsounds.soundspec?rev=28400&r1=28399&r2=28400&view=diff
==============================================================================
--- trunk/data/stdsounds.soundspec      (original)
+++ trunk/data/stdsounds.soundspec      Tue Mar  3 23:20:29 2015
@@ -316,7 +316,7 @@
 ;e_wonder_will_be_built = ""
 ;e_worklist = ""
 ;e_unit_illegal_action = ""
-;e_extra_spread = ""
+;e_extra_appears = ""
 
 ; This pseudo-event is only used in the sound system.
 ;e_game_quit = ""

Modified: trunk/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=28400&r1=28399&r2=28400&view=diff
==============================================================================
--- trunk/server/srv_main.c     (original)
+++ trunk/server/srv_main.c     Tue Mar  3 23:20:29 2015
@@ -1284,7 +1284,7 @@
           /* TODO: Put probability that an extra will spread in an
            * effect ("Extra_Spread_Pm") on the source tile.
            * With a cache of what extra types that has any chance of
-           * spreading at all it could replace the EF_SPREADS extra flag
+           * spreading at all it could replace the EF_APPEARS extra flag
            * without killing performance. */
           && fc_rand(1000) < 15) {
         struct tile *tgt_tile;
@@ -1313,9 +1313,9 @@
 
         if (tile_owner(tgt_tile) != NULL) {
           notify_player(tile_owner(tgt_tile), tgt_tile,
-                        E_EXTRA_SPREAD, ftc_server,
-                        /* TRANS: Small Fish spreads to (32, 72). */
-                        _("%s spreads to %s."),
+                        E_EXTRA_APPEARS, ftc_server,
+                        /* TRANS: Small Fish appears to (32, 72). */
+                        _("%s appears to %s."),
                         extra_name_translation(pextra),
                         tile_link(tgt_tile));
         }


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

Reply via email to