Merge branch 'master' into jgrpp

2017-07-27 18:41:43 +01:00
parent 103cabb178 bf3fd277c1
commit 52dadc9252
5 changed files with 37 additions and 38 deletions
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -2409,7 +2409,7 @@ struct CompanyWindow : Window

 	virtual void OnPlaceObject(Point pt, TileIndex tile)
 	{
-		if (DoCommandP(tile, OBJECT_HQ, 0, CMD_BUILD_OBJECT | CMD_MSG(STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS))) {
+		if (DoCommandP(tile, OBJECT_HQ, 0, CMD_BUILD_OBJECT | CMD_MSG(STR_ERROR_CAN_T_BUILD_COMPANY_HEADQUARTERS)) && !_shift_pressed) {
 			ResetObjectToPlace();
 			this->RaiseButtons();
 		}