Author: cazfi
Date: Thu Nov 26 06:30:15 2015
New Revision: 30784

URL: http://svn.gna.org/viewcvs/freeciv?rev=30784&view=rev
Log:
Reverted bug #23997 commit, that tried to fix problems of defense bonus effects 
in relation
to wall value.

Modified:
    branches/S2_6/ai/default/advmilitary.c

Modified: branches/S2_6/ai/default/advmilitary.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/advmilitary.c?rev=30784&r1=30783&r2=30784&view=diff
==============================================================================
--- branches/S2_6/ai/default/advmilitary.c      (original)
+++ branches/S2_6/ai/default/advmilitary.c      Thu Nov 26 06:30:15 2015
@@ -781,15 +781,9 @@
       int limit_cost = pcity->shield_stock + 40;
 
       if (walls && !utype_has_flag(punittype, UTYF_BADCITYDEFENDER)) {
-        /* FIXME: Below if() is just workaround to make sure desire
-         *        is not made zero when 'walls' above is not actually
-         *        walls that increase wallvalue, but misdiagnosed
-         *        because of some other defense bonus the city gets. */
-        if (city_data->wallvalue > POWER_FACTOR) {
-          desire *= city_data->wallvalue;
-          /* TODO: More use of POWER_FACTOR ! */
-          desire /= POWER_FACTOR;
-        }
+       desire *= city_data->wallvalue;
+       /* TODO: More use of POWER_FACTOR ! */
+       desire /= POWER_FACTOR;
       }
 
       if ((best_unit_cost > limit_cost


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

Reply via email to