Index: server/settlers.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/settlers.c,v retrieving revision 1.146 diff -u -r1.146 settlers.c --- server/settlers.c 2002/09/27 12:32:47 1.146 +++ server/settlers.c 2002/10/29 21:27:57 @@ -937,16 +937,23 @@ if (*ferryboat) { /* already aboard ship, can use real warmap */ if (!is_terrain_near_tile(x, y, T_OCEAN)) { - mv_cost = 9999; + mv_cost = 9909; } else { mv_cost = warmap.seacost[x][y] * mv_rate / unit_type(*ferryboat)->move_rate; } } else if (!goto_is_sane(punit, x, y, TRUE) || warmap.cost[x][y] > THRESHOLD * mv_rate) { + freelog(LOG_NORMAL, + "punit=(%d,%d) dest=(%d,%d) sane=%d cost=%d move_rate=%d", + punit->x, punit->y,x,y, + goto_is_sane(punit, x, y, TRUE), + warmap.cost[x][y], + mv_rate); + /* for Rome->Carthage */ if (!is_terrain_near_tile(x, y, T_OCEAN)) { - mv_cost = 9999; + mv_cost = 9990; } else if (boatid != 0) { if (punit->id == 0 && mycity->id == boatid) { w_virtual = TRUE; @@ -955,7 +962,7 @@ + mv_rate; } else if (punit->id != 0 || !is_terrain_near_tile(mycity->x, mycity->y, T_OCEAN)) { - mv_cost = 9999; + mv_cost = 9099; } else { mv_cost = warmap.seacost[x][y] * mv_rate / 9; /* this should be fresh; the only thing that could have @@ -1021,7 +1028,7 @@ } } square_iterate_end; - freelog(LOG_DEBUG, + freelog(LOG_NORMAL, "%s (%d, %d) wants city at (%d, %d) with want %d, distance %d moves", (punit->id != 0 ? unit_type(punit)->name : mycity->name), punit->x, punit->y, *gx, *gy, best_newv, moves); @@ -1044,7 +1051,7 @@ int mv_rate = unit_type(punit)->move_rate; int mv_turns; /* estimated turns to move to target square */ int oldv; /* current value of consideration tile */ - int best_oldv = 9999; /* oldv of best target so far; compared if + int best_oldv = 9009; /* oldv of best target so far; compared if newv==best_newv; not initialized to zero, so that newv=0 activities are not chosen */ int food_upkeep = unit_food_upkeep(punit); @@ -1169,7 +1176,7 @@ best_newv = 0; /* Bad Things happen without this line! :( -- Syela */ if (best_newv > 0) { - freelog(LOG_DEBUG, + freelog(LOG_NORMAL, "Settler %d@(%d,%d) wants to %s at (%d,%d) with desire %d", punit->id, punit->x, punit->y, get_activity_text(*best_act), *gx, *gy, best_newv);