--- common/unit.c.original	Thu Mar 23 22:05:05 2000
+++ common/unit.c	Thu Mar 23 23:09:14 2000
@@ -943,7 +943,7 @@
   case ACTIVITY_ROAD:
     return terrain_control.may_road &&
            unit_flag(punit->type, F_SETTLERS) &&
-           !(ptile->special&S_ROAD) && ptile->terrain!=T_OCEAN &&
+           !(ptile->special&S_ROAD) && tile_types[ptile->terrain].road_time &&
 	   ((ptile->terrain!=T_RIVER && !(ptile->special&S_RIVER)) || 
 	    player_knows_techs_with_flag(pplayer, TF_BRIDGE));
 
@@ -1005,7 +1005,7 @@
     return terrain_control.may_road &&
            unit_flag(punit->type, F_SETTLERS) &&
            ((ptile->special&S_ROAD) || (punit->connecting
-	    && (ptile->terrain!=T_OCEAN &&
+	    && (tile_types[ptile->terrain].road_time &&
 		((ptile->terrain!=T_RIVER && !(ptile->special&S_RIVER))
 		 || player_knows_techs_with_flag(pplayer, TF_BRIDGE)))))
            && !(ptile->special&S_RAILROAD) &&
@@ -1029,7 +1029,7 @@
 
   case ACTIVITY_TRANSFORM:
     return terrain_control.may_transform &&
-           (ptile->terrain != T_OCEAN) &&
+           (tile_types[ptile->terrain].transform_time) &&
            (ptile->terrain != T_RIVER) &&
 	   unit_flag(punit->type, F_TRANSFORM) && punit->moves_left;