Author: cazfi
Date: Thu Nov 13 22:21:08 2014
New Revision: 27043

URL: http://svn.gna.org/viewcvs/freeciv?rev=27043&view=rev
Log:
Assert that other ACTIVITY_GEN_ROAD units in the tile have road target set in 
autosettler code.

See patch #5420

Modified:
    trunk/server/advisors/autosettlers.c

Modified: trunk/server/advisors/autosettlers.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/advisors/autosettlers.c?rev=27043&r1=27042&r2=27043&view=diff
==============================================================================
--- trunk/server/advisors/autosettlers.c        (original)
+++ trunk/server/advisors/autosettlers.c        Thu Nov 13 22:21:08 2014
@@ -135,7 +135,11 @@
           if (punit->activity == ACTIVITY_GEN_ROAD) {
             /* If a road, or its dependency is being built here, consider as 
if it's already
             * built. */
-            int build_rnbr = 
road_index(extra_road_get(punit->activity_target));
+            int build_rnbr;
+
+            fc_assert(punit->activity_target != NULL);
+
+            build_rnbr = road_index(extra_road_get(punit->activity_target));
 
             if (build_rnbr == rnbr) {
               real_road[i] = TRUE;


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

Reply via email to