| … | |
… | |
| 4889 | // nothing |
4889 | // nothing |
| 4890 | ret = g_strdup(""); |
4890 | ret = g_strdup(""); |
| 4891 | } |
4891 | } |
| 4892 | else |
4892 | else |
| 4893 | { |
4893 | { |
| 4894 | // TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination |
4894 | // TRANSLATORS: First argument is strength, second direction, third distance, fourth destination |
| 4895 | ret = g_strdup_printf_4_str(_("then turn %1$s%2$s %3$s%4$s"), strength, dir, d, destination ? destination : ""); |
4895 | ret = g_strdup_printf_4_str(_("then turn %1$s%2$s %3$s%4$s"), strength, dir, d, destination ? destination : ""); |
| 4896 | } |
4896 | } |
| 4897 | } |
4897 | } |
| 4898 | else |
4898 | else |
| 4899 | { |
4899 | { |
| 4900 | if (delta >= 10) |
4900 | if (delta >= 10) |
| 4901 | { |
4901 | { |
| 4902 | // TRANSLATORS: First argument is strength, second direction, third how many roads to skip, fourth destination |
4902 | // TRANSLATORS: First argument is strength, second direction, third distance, fourth destination |
| 4903 | ret = g_strdup_printf_4_str(_("then turn %1$s%2$s %3$s%4$s"), strength, dir, d, destination ? destination : ""); |
4903 | ret = g_strdup_printf_4_str(_("then turn %1$s%2$s %3$s%4$s"), strength, dir, d, destination ? destination : ""); |
| 4904 | } |
4904 | } |
| 4905 | else |
4905 | else |
| 4906 | { |
4906 | { |
| 4907 | ret = g_strdup(""); |
4907 | ret = g_strdup(""); |
| … | |
… | |
| 5607 | break; |
5607 | break; |
| 5608 | case 1: |
5608 | case 1: |
| 5609 | d = get_distance(nav, distance, attr_navigation_short, 0); |
5609 | d = get_distance(nav, distance, attr_navigation_short, 0); |
| 5610 | break; |
5610 | break; |
| 5611 | case 0: |
5611 | case 0: |
| 5612 | skip_roads = count_possible_turns(nav, cmd->prev ? cmd->prev->itm : nav->first, cmd->itm, cmd->delta); |
5612 | // DISABLE S_R // skip_roads = count_possible_turns(nav, cmd->prev ? cmd->prev->itm : nav->first, cmd->itm, cmd->delta); |
|
|
5613 | skip_roads = 0; |
| 5613 | |
5614 | |
| 5614 | dbg(0, "count_possible_turns:1:%d", skip_roads); |
5615 | dbg(0, "count_possible_turns:1:%d", skip_roads); |
| 5615 | |
5616 | |
| 5616 | if ((skip_roads > 0) && ((global_vehicle_profile != 1) && (global_vehicle_profile != 2))) |
5617 | if ((skip_roads > 0) && ((global_vehicle_profile != 1) && (global_vehicle_profile != 2))) |
| 5617 | { |
5618 | { |
| … | |
… | |
| 5659 | } |
5660 | } |
| 5660 | |
5661 | |
| 5661 | break; |
5662 | break; |
| 5662 | |
5663 | |
| 5663 | case -2: |
5664 | case -2: |
| 5664 | skip_roads = count_possible_turns(nav, cmd->prev->itm, cmd->itm, cmd->delta); |
5665 | // DISABLE S_R // skip_roads = count_possible_turns(nav, cmd->prev->itm, cmd->itm, cmd->delta); |
|
|
5666 | skip_roads = 0; |
| 5665 | |
5667 | |
| 5666 | dbg(0, "count_possible_turns:2:%d", skip_roads); |
5668 | dbg(0, "count_possible_turns:2:%d", skip_roads); |
| 5667 | |
5669 | |
| 5668 | if ((skip_roads > 0) && ((global_vehicle_profile != 1) && (global_vehicle_profile != 2))) |
5670 | if ((skip_roads > 0) && ((global_vehicle_profile != 1) && (global_vehicle_profile != 2))) |
| 5669 | { |
5671 | { |
Parent Directory
| 
Revision Log
| 
Patch