mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r24600) [1.2] -Backport from trunk: 

- Fix: Trains were unable to reverse in stations when using NPF (r24479)
- Fix: The --xxx yyy format (instead of --xxx=yyy) for configure did not work (r24471)
- Fix: --prefix was not accepted by configure (r24470)
- Fix: Changing auto-refit for a 'goto station' order was inadvertently modifying the full load state [FS#5264] (r24457)
release/1.2
rubidium 2012-10-17 18:43:23 +00:00
parent 3724f6c023
commit 05f3b51703
3 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
config.lib
View File

@ -197,21 +197,21 @@ detect_params() {
--cpu-type) prev_p="cpu_type";;
--cpu-type=*) cpu_type="$optarg";;
--cc-build) prevp_p="cc_build";;
--cc-build) prev_p="cc_build";;
--cc-build=*) cc_build="$optarg";;
--cc-host) prevp_p="cc_host";;
--cc-host) prev_p="cc_host";;
--cc-host=*) cc_host="$optarg";;
--cxx-build) prevp_p="cxx_build";;
--cxx-build) prev_p="cxx_build";;
--cxx-build=*) cxx_build="$optarg";;
--cxx-host) prevp_p="cxx_host";;
--cxx-host) prev_p="cxx_host";;
--cxx-host=*) cxx_host="$optarg";;
--windres) prevp_p="windres";;
--windres) prev_p="windres";;
--windres=*) windres="$optarg";;
--awk) prevp_p="awk";;
--awk) prev_p="awk";;
--awk=*) awk="$optarg";;
--strip) prevp_p="strip";;
--strip) prev_p="strip";;
--strip=*) strip="$optarg";;
--lipo) prevp_p="lipo";;
--lipo) prev_p="lipo";;
--lipo=*) lipo="$optarg";;
--endian) prev_p="endian";;
@ -219,52 +219,53 @@ detect_params() {
--prefix-dir) prevp_p="prefix-dir";;
--prefix-dir=*) prefix_dir="$optarg";;
# Alias --prefix with --prefix-dir, for compatibility with GNU autotools
--prefix-dir | --prefix) prev_p="prefix_dir";;
--prefix-dir=* | --prefix=*) prefix_dir="$optarg";;
--binary-dir) prevp_p="binary-dir";;
--binary-dir) prev_p="binary_dir";;
--binary-dir=*) binary_dir="$optarg";;
--data-dir) prevp_p="data-dir";;
--data-dir) prev_p="data_dir";;
--data-dir=*) data_dir="$optarg";;
--doc-dir) prevp_p="doc-dir";;
--doc-dir) prev_p="doc_dir";;
--doc-dir=*) doc_dir="$optarg";;
--icon-dir) prevp_p="icon-dir";;
--icon-dir) prev_p="icon_dir";;
--icon-dir=*) icon_dir="$optarg";;
--icon-theme-dir) prevp_p="icon-theme-dir";;
--icon-theme-dir) prev_p="icon_theme_dir";;
--icon-theme-dir=*) icon_theme_dir="$optarg";;
--without-icon-theme) icon_theme_dir="";;
--menu-dir) prevp_p="menu_dir";;
--menu-dir) prev_p="menu_dir";;
--menu-dir=*) menu_dir="$optarg";;
--without-menu-entry) menu_dir="";;
--menu-name) prevp_p="menu_name";;
--menu-name) prev_p="menu_name";;
--menu-name=*) menu_name="$optarg";;
--binary-name) prevp_p="binary_name";;
--binary-name) prev_p="binary_name";;
--binary-name=*) binary_name="$optarg";;
--man-dir) prevp_p="man_dir";;
--man-dir) prev_p="man_dir";;
--man-dir=*) man_dir="$optarg";;
--personal-dir) prevp_p="personal-dir";;
--personal-dir) prev_p="personal_dir";;
--personal-dir=*) personal_dir="$optarg";;
--without-personal-dir) personal_dir="";;
--shared-dir) prevp_p="shared-dir";;
--shared-dir) prev_p="shared_dir";;
--shared-dir=*) shared_dir="$optarg";;
--without-shared-dir) shared_dir="";;
--install-dir) prevp_p="install-dir";;
--install-dir) prev_p="install_dir";;
--install-dir=*) install_dir="$optarg";;
--menu-group) prevp_p="menu_group";;
--menu-group) prev_p="menu_group";;
--menu-group=*) menu_group="$optarg";;

2
src/order_cmd.cpp
View File

@ -1612,7 +1612,7 @@ CommandCost CmdOrderRefit(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
order->SetRefit(cargo, subtype);
/* Make the depot order an 'always go' order. */
if (cargo != CT_NO_REFIT) {
if (cargo != CT_NO_REFIT && order->IsType(OT_GOTO_DEPOT)) {
order->SetDepotOrderType((OrderDepotTypeFlags)(order->GetDepotOrderType() & ~ODTFB_SERVICE));
order->SetDepotActionType((OrderDepotActionFlags)(order->GetDepotActionType() & ~ODATFB_HALT));
}

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

@ -1240,7 +1240,7 @@ bool NPFTrainCheckReverse(const Train *v)
ftd = NPFRouteToStationOrTileTwoWay(v->tile, trackdir, false, last->tile, trackdir_rev, false, &fstd, TRANSPORT_RAIL, 0, v->owner, v->compatible_railtypes);
/* If we didn't find anything, just keep on going straight ahead, otherwise take the reverse flag */
return ftd.best_bird_dist != 0 && NPFGetFlag(&ftd.node, NPF_FLAG_REVERSE);
return ftd.best_bird_dist == 0 && NPFGetFlag(&ftd.node, NPF_FLAG_REVERSE);
}
Track NPFTrainChooseTrack(const Train *v, TileIndex tile, DiagDirection enterdir, TrackBits tracks, bool &path_found, bool reserve_track, struct PBSTileInfo *target)