Re: [Freeciv-Dev] (PR#40422) [Patch] Fix couple of AI Ocean city crashes

[Marko Lindqvist]

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

 - Use type "Continent_id" instead of "int"
 - S2_1 version


 - ML


diff -Nurd -X.diff_ignore freeciv/ai/aidata.c freeciv/ai/aidata.c
--- freeciv/ai/aidata.c 2008-06-18 18:49:37.000000000 +0300
+++ freeciv/ai/aidata.c 2008-08-10 01:00:40.000000000 +0300
@@ -256,7 +256,9 @@
      * coastal fortresses and hunting down enemy transports. */
     city_list_iterate(aplayer->cities, acity) {
       Continent_id continent = tile_continent(acity->tile);
-      ai->threats.continent[continent] = TRUE;
+      if (continent >= 0) {
+        ai->threats.continent[continent] = TRUE;
+      }
     } city_list_iterate_end;
 
     unit_list_iterate(aplayer->units, punit) {
@@ -411,7 +413,10 @@
   ai->stats.cities = fc_calloc(ai->num_continents + 1, sizeof(int));
   ai->stats.average_production = 0;
   city_list_iterate(pplayer->cities, pcity) {
-    ai->stats.cities[(int)tile_continent(pcity->tile)]++;
+    Continent_id continent = tile_continent(pcity->tile);
+    if (continent >= 0) {
+      ai->stats.cities[continent]++;
+    }
     ai->stats.average_production += pcity->surplus[O_SHIELD];
   } city_list_iterate_end;
   ai->stats.average_production /= MAX(1, city_list_size(pplayer->cities));

diff -Nurd -X.diff_ignore freeciv/ai/aidata.c freeciv/ai/aidata.c
--- freeciv/ai/aidata.c 2008-05-17 02:27:57.000000000 +0300
+++ freeciv/ai/aidata.c 2008-08-10 00:59:21.000000000 +0300
@@ -256,7 +256,9 @@
      * coastal fortresses and hunting down enemy transports. */
     city_list_iterate(aplayer->cities, acity) {
       Continent_id continent = tile_get_continent(acity->tile);
-      ai->threats.continent[continent] = TRUE;
+      if (continent >= 0) {
+        ai->threats.continent[continent] = TRUE;
+      }
     } city_list_iterate_end;
 
     unit_list_iterate(aplayer->units, punit) {
@@ -364,7 +366,10 @@
   ai->stats.cities = fc_calloc(ai->num_continents + 1, sizeof(int));
   ai->stats.average_production = 0;
   city_list_iterate(pplayer->cities, pcity) {
-    ai->stats.cities[(int)tile_get_continent(pcity->tile)]++;
+    Continent_id continent = tile_get_continent(pcity->tile);
+    if (continent >= 0) {
+      ai->stats.cities[continent]++;
+    }
     ai->stats.average_production += pcity->surplus[O_SHIELD];
   } city_list_iterate_end;
   ai->stats.average_production /= MAX(1, city_list_size(pplayer->cities));

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