update to 1.6.0

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2016-04-02 00:50:09 +03:00
parent fe10aa3cba
commit 5c9ef5a264
223 changed files with 4115 additions and 3050 deletions

View File

@@ -1,4 +1,4 @@
/* $Id: terraform_cmd.cpp 26902 2014-09-21 17:37:30Z rubidium $ */
/* $Id: terraform_cmd.cpp 27381 2015-08-10 20:24:13Z michi_cc $ */
/*
* This file is part of OpenTTD.
@@ -403,7 +403,7 @@ CommandCost CmdTerraformLand(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
}
}
if (c != NULL) c->terraform_limit -= ts.tile_to_new_height.size() << 16;
if (c != NULL) c->terraform_limit -= (uint32)ts.tile_to_new_height.size() << 16;
}
return total_cost;
}