[Freeciv-commits] r27449 - /branches/S2_5/server/cityturn.c

[cazfi74]

Author: cazfi
Date: Tue Dec 30 05:41:17 2014
New Revision: 27449

URL: http://svn.gna.org/viewcvs/freeciv?rev=27449&view=rev
Log:
Removed the message about how city survived a disaster without any serious 
effects
since we cannot know if lua script implements something for such a disaster not 
having
internal effects.

Requested by Jacob Nevins <jtn>

See bug #22082

Modified:
    branches/S2_5/server/cityturn.c

Modified: branches/S2_5/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/cityturn.c?rev=27449&r1=27448&r2=27449&view=diff
==============================================================================
--- branches/S2_5/server/cityturn.c     (original)
+++ branches/S2_5/server/cityturn.c     Tue Dec 30 05:41:17 2014
@@ -2943,7 +2943,6 @@
 {
   struct player *pplayer = city_owner(pcity);
   struct tile *ptile = city_tile(pcity);
-  bool had_effect = FALSE;
 
   log_debug("%s at %s", disaster_rule_name(pdis), city_name(pcity));
 
@@ -2957,7 +2956,6 @@
     if (place_pollution(pcity, S_POLLUTION)) {
       notify_player(pplayer, ptile, E_DISASTER, ftc_server,
                     _("Tile polluted"));
-      had_effect = TRUE;
     }
   }
 
@@ -2965,7 +2963,6 @@
     if (place_pollution(pcity, S_FALLOUT)) {
       notify_player(pplayer, ptile, E_DISASTER, ftc_server,
                     _("Fallout contaminated tile."));
-      had_effect = TRUE;
     }
   }
 
@@ -2978,8 +2975,6 @@
       notify_player(pplayer, ptile, E_DISASTER, ftc_server,
                     _("Some population lost."));
     }
-
-    had_effect = TRUE;
   }
 
   if (pcity && disaster_has_effect(pdis, DE_DESTROY_BUILDING)) {
@@ -3000,8 +2995,6 @@
       notify_player(pplayer, ptile, E_DISASTER, ftc_server,
                     _("%s destroyed."),
                     improvement_name_translation(imprs[num]));
-
-      had_effect = TRUE;
     }
   }
 
@@ -3011,8 +3004,6 @@
 
       notify_player(pplayer, ptile, E_DISASTER, ftc_server,
                     _("Foodbox emptied."));
-
-      had_effect = TRUE;
     }
   }
 
@@ -3022,15 +3013,7 @@
 
       notify_player(pplayer, ptile, E_DISASTER, ftc_server,
                     _("Production box emptied."));
-
-      had_effect = TRUE;
-
-    }
-  }
-
-  if (!had_effect) {
-    notify_player(pplayer, ptile, E_DISASTER, ftc_server,
-                  _("We survived the disaster without serious damages."));
+    }
   }
 
   script_server_signal_emit("disaster", 2,


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