[Freeciv-Dev] (PR#40400) [Patch] Fix civmanual crashes

[Marko Lindqvist]

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

 $subject


 - ML


diff -Nurd -X.diff_ignore freeciv/manual/civmanual.c freeciv/manual/civmanual.c
--- freeciv/manual/civmanual.c  2008-03-08 16:32:50.000000000 +0200
+++ freeciv/manual/civmanual.c  2008-07-24 22:12:15.000000000 +0300
@@ -107,7 +107,10 @@
   char filename[40];
   enum manuals manuals;
 
+  /* Initialize game with default values */
   game_init();
+  /* Reset aifill to zero */
+  game.info.aifill = 0;
   load_rulesets();
   for (manuals = 0; manuals < MANUAL_COUNT; manuals++) {
     int i;
@@ -268,9 +271,14 @@
         }
         fprintf(doc, "<tr><td>+%d T</td><td align=\"right\">(%d)</td></tr>\n",
                 pterrain->road_trade_incr, pterrain->road_time);
-        fprintf(doc, "<tr><td>%s</td><td 
align=\"right\">(%d)</td></tr>\n</table></td>\n",
-                terrain_name_translation(pterrain->transform_result),
-                pterrain->transform_time);
+
+        if (pterrain->transform_result) {
+          fprintf(doc, "<tr><td>%s</td><td 
align=\"right\">(%d)</td></tr>\n</table></td>\n",
+                  terrain_name_translation(pterrain->transform_result),
+                  pterrain->transform_time);
+        } else {
+          fprintf(doc, "<tr><td>-</td><td 
align=\"right\">(-)</td></tr>\n</table></td>\n");
+        }
 
         fprintf(doc, "<td align=\"center\">%d / %d / %d</td></tr>\n\n",
                 pterrain->rail_time,

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