dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'PR-7229' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-02-16 10:34:33 +00:00
parent e28e2f638e d1536ac409
commit 777a79e1a9
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lang/english_US.txt
View File

@@ -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)

3
src/pathfinder/npf/npf.cpp
View File

@@ -1170,13 +1170,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);
}