Author: cazfi
Date: Thu Nov 17 10:33:20 2016
New Revision: 34547

URL: http://svn.gna.org/viewcvs/freeciv?rev=34547&view=rev
Log:
Fixed pillaging of extras that have no cause.

Reported by wotan <wotan>

See bug #25284

Modified:
    branches/S2_6/common/terrain.c

Modified: branches/S2_6/common/terrain.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/terrain.c?rev=34547&r1=34546&r2=34547&view=diff
==============================================================================
--- branches/S2_6/common/terrain.c      (original)
+++ branches/S2_6/common/terrain.c      Thu Nov 17 10:33:20 2016
@@ -650,6 +650,12 @@
     }
   } extra_type_by_cause_iterate_rev_end;
 
+  extra_type_by_cause_iterate_rev(EC_NONE, pextra) {
+    if (is_extra_removed_by(pextra, ERM_PILLAGE) && BV_ISSET(extras, 
extra_index(pextra))) {
+      return pextra;
+    }
+  } extra_type_by_cause_iterate_rev_end;
+
   return NULL;
 }
 


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

Reply via email to