Merge branch 'save_ext' into enhanced_viewport_overlay-sx

2015-11-18 23:33:00 +00:00
parent 0ee812b5a9 9914ba7e63
commit ea3198cc25
58 changed files with 1016 additions and 471 deletions
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1207,6 +1207,7 @@ void ChangeWindowOwner(Owner old_owner, Owner new_owner)
 			case WC_BUY_COMPANY:
 			case WC_COMPANY:
 			case WC_COMPANY_INFRASTRUCTURE:
+			case WC_VEHICLE_ORDERS: // Changing owner would also require changing WindowDesc, which is not possible; however keeping the old one crashes because of missing widgets etc.. See ShowOrdersWindow().
 				continue;

 			default: