[Freeciv-Dev] Re: (PR#14618) Continent-range Effects Crash

["Benedict Adamson" <badamson@xxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=14618 >

I *think* this is a proper fix.

Only in vendor.freeciv.current: blame
Only in vendor.freeciv.current/client: freeciv.desktop
diff -Xvendor.freeciv.current/diff_ignore -ru 
vendor.freeciv.current/common/requirements.c 
freeciv.PR14618/common/requirements.c
--- vendor.freeciv.current/common/requirements.c        2005-10-13 
22:02:04.000000000 +0100
+++ freeciv.PR14618/common/requirements.c       2005-11-19 17:23:06.000000000 
+0000
@@ -590,11 +590,13 @@
   case REQ_RANGE_PLAYER:
     return target_player ? num_player_buildings(target_player, source) : 0;
   case REQ_RANGE_CONTINENT:
-    if (target_player) {
+    if (target_player && target_city) {
       int continent = tile_get_continent(target_city->tile);
 
       return num_continent_buildings(target_player, continent, source);
     } else {
+      /* At present, "Continent" effects can affect only
+       * cities and units in cities. */
       return 0;
     }
   case REQ_RANGE_CITY:
Only in vendor.freeciv.current/data: Freeciv
diff -Xvendor.freeciv.current/diff_ignore -ru 
vendor.freeciv.current/doc/README.effects freeciv.PR14618/doc/README.effects
--- vendor.freeciv.current/doc/README.effects   2005-10-27 20:08:12.000000000 
+0100
+++ freeciv.PR14618/doc/README.effects  2005-11-19 17:22:48.000000000 +0000
@@ -180,6 +180,8 @@
              "None", "Local", "Adjacent", "City", "Continent",
              "Player", "World".  Some requirement types may only work at
              certain ranges; this is not yet documented.
+             In particular, at present, "Continent" effects can affect only
+             cities and units in cities.
 .value    = integral AMOUNT parameter for many effects
            (must be in the range -32767 to 32767)
 .survives  = 1 if effect survives destruction (wonders only)
Only in vendor.freeciv.current/po: nb.po