dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/station_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2019-03-13 18:36:36 +00:00
parent 290471c70f b00a861467
commit e3b85f617b
6 changed files with 59 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/object_cmd.cpp
View File

@@ -158,12 +158,11 @@ void UpdateCompanyHQ(TileIndex tile, uint score)
{
if (tile == INVALID_TILE) return;
byte val;
(val = 0, score < 170) ||
(val++, score < 350) ||
(val++, score < 520) ||
(val++, score < 720) ||
(val++, true);
byte val = 0;
if (score >= 170) val++;
if (score >= 350) val++;
if (score >= 520) val++;
if (score >= 720) val++;
while (GetCompanyHQSize(tile) < val) {
IncreaseCompanyHQSize(tile);