(svn r19927) [1.0] -Backport from trunk:

- Fix: [YAPP] Inform the pathfinder as well about the fact that the backside of an one-way path signal can be a safe waiting point [FS#3803] (r19896)
- Fix: Allow loading savegames from the console without specifying the ".sav" extension, i.e. make it consistent with saving savegames from the console [FS#3761] (r19885)
- Fix: Dropdowns did affect positioning of new windows because they were not yet removed when the new windows were positioned [FS#3812] (r19883)
- Fix: [NoAI] AIEngine::IsValidEngine() and AIEngine::IsBuildable() returned false positives. Especially wagons of unavailable railtypes were reported available (r19880)

src/ai/api/ai_engine.cpp

@@ -16,20 +16,21 @@
 #include "../../strings_func.h"
 #include "../../rail.h"
 #include "../../engine_base.h"
+#include "../../engine_func.h"
 #include "../../articulated_vehicles.h"
 #include "table/strings.h"
 
 /* static */ bool AIEngine::IsValidEngine(EngineID engine_id)
 {
 	const Engine *e = ::Engine::GetIfValid(engine_id);
-	return e != NULL && (HasBit(e->company_avail, _current_company) || ::Company::Get(_current_company)->num_engines[engine_id] > 0);
+	return e != NULL && (::IsEngineBuildable(engine_id, e->type, _current_company) || ::Company::Get(_current_company)->num_engines[engine_id] > 0);
 
 }
 
 /* static */ bool AIEngine::IsBuildable(EngineID engine_id)
 {
 	const Engine *e = ::Engine::GetIfValid(engine_id);
-	return e != NULL && HasBit(e->company_avail, _current_company);
+	return e != NULL && ::IsEngineBuildable(engine_id, e->type, _current_company);
 }
 
 /* static */ char *AIEngine::GetName(EngineID engine_id)

src/console_cmds.cpp

@@ -252,7 +252,18 @@ static const FiosItem *GetFiosItem(const char *file)
 	int i = strtol(file, &endptr, 10);
 	if (file == endptr || *endptr != '\0') i = -1;
 
-	return IsInsideMM(i, 0, _fios_items.Length()) ? _fios_items.Get(i) : NULL;
+	if (IsInsideMM(i, 0, _fios_items.Length())) return _fios_items.Get(i);
+
+	/* As a last effort assume it is an OpenTTD savegame and
+	 * that the ".sav" part was not given. */
+	char long_file[MAX_PATH];
+	seprintf(long_file, lastof(long_file), "%s.sav", file);
+	for (const FiosItem *item = _fios_items.Begin(); item != _fios_items.End(); item++) {
+		if (strcmp(long_file, item->name) == 0) return item;
+		if (strcmp(long_file, item->title) == 0) return item;
+	}
+
+	return NULL;
 }
 
 

src/pathfinder/yapf/yapf_costrail.hpp

@@ -507,9 +507,12 @@ no_entry_cost: // jump here at the beginning if the node has no parent (it is th
 			/* Gather the next tile/trackdir/tile_type/rail_type. */
 			TILE next(tf_local.m_new_tile, (Trackdir)FindFirstBit2x64(tf_local.m_new_td_bits));
 
-			if (TrackFollower::DoTrackMasking() && HasPbsSignalOnTrackdir(next.tile, next.td)) {
-				/* Possible safe tile. */
-				end_segment_reason |= ESRB_SAFE_TILE;
+			if (TrackFollower::DoTrackMasking() && IsTileType(next.tile, MP_RAILWAY)) {
+				if ((HasSignalOnTrackdir(next.tile, next.td) && IsPbsSignal(GetSignalType(next.tile, TrackdirToTrack(next.td)))) ||
+						(HasSignalOnTrackdir(next.tile, ReverseTrackdir(next.td)) && GetSignalType(next.tile, TrackdirToTrack(next.td)) == SIGTYPE_PBS_ONEWAY)) {
+					/* Possible safe tile. */
+					end_segment_reason |= ESRB_SAFE_TILE;
+				}
 			}
 
 			/* Check the next tile for the rail type. */

src/widgets/dropdown.cpp

@@ -281,6 +281,9 @@ struct DropdownWindow : Window {
 		}
 
 		if (this->click_delay != 0 && --this->click_delay == 0) {
+			/* Make the dropdown "invisible", so it doesn't affect new window placement. */
+			this->window_class = WC_INVALID;
+
 			w2->OnDropdownSelect(this->parent_button, this->selected_index);
 			delete this;
 			return;
@@ -293,6 +296,9 @@ struct DropdownWindow : Window {
 				this->drag_mode = false;
 				if (!this->GetDropDownItem(item)) {
 					if (this->instant_close) {
+						/* Make the dropdown "invisible", so it doesn't affect new window placement. */
+						this->window_class = WC_INVALID;
+
 						if (GetWidgetFromPos(w2, _cursor.pos.x - w2->left, _cursor.pos.y - w2->top) == this->parent_button) {
 							/* Send event for selected option if we're still
 							 * on the parent button of the list. */