From 045503e728f5db9784ca2e16720700d70f8e1627 Mon Sep 17 00:00:00 2001 From: translators Date: Wed, 13 Feb 2019 19:45:43 +0100 Subject: [PATCH 1/2] Update: Translations from eints english (us): 1 change by njn --- src/lang/english_US.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index 0f3baee134..6019681249 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -917,7 +917,7 @@ STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder ( STR_GAME_OPTIONS_CURRENCY_NOK :Norwegian Krone (NOK) STR_GAME_OPTIONS_CURRENCY_PLN :Polish Złoty (PLN) STR_GAME_OPTIONS_CURRENCY_RON :Romanian Leu (RON) -STR_GAME_OPTIONS_CURRENCY_RUR :Russian Rubel (RUR) +STR_GAME_OPTIONS_CURRENCY_RUR :Russian Ruble (RUR) STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar (SIT) STR_GAME_OPTIONS_CURRENCY_SEK :Swedish Krona (SEK) STR_GAME_OPTIONS_CURRENCY_TRY :Turkish Lira (TRY) From d1536ac40905f7986c21771efe464ff2412311bb Mon Sep 17 00:00:00 2001 From: peter1138 Date: Thu, 14 Feb 2019 12:45:22 +0000 Subject: [PATCH 2/2] Fix #7114: Partial revert of 7d06fec799 for ship pathfinding. --- src/pathfinder/npf/npf.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pathfinder/npf/npf.cpp b/src/pathfinder/npf/npf.cpp index 7d19d4ef1d..dac5ecb6f5 100644 --- a/src/pathfinder/npf/npf.cpp +++ b/src/pathfinder/npf/npf.cpp @@ -1163,13 +1163,12 @@ Track NPFShipChooseTrack(const Ship *v, bool &path_found) AyStarUserData user = { v->owner, TRANSPORT_WATER, INVALID_RAILTYPES, ROADTYPES_NONE }; NPFFoundTargetData ftd = NPFRouteToStationOrTile(v->tile, trackdir, true, &fstd, &user); - assert(ftd.best_trackdir != INVALID_TRACKDIR); - /* If ftd.best_bird_dist is 0, we found our target and ftd.best_trackdir contains * the direction we need to take to get there, if ftd.best_bird_dist is not 0, * we did not find our target, but ftd.best_trackdir contains the direction leading * to the tile closest to our target. */ path_found = (ftd.best_bird_dist == 0); + if (ftd.best_trackdir == INVALID_TRACKDIR) return INVALID_TRACK; return TrackdirToTrack(ftd.best_trackdir); }