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/town_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2020-06-05 17:07:58 +01:00
parent 677940cfc6 eeed3a7613
commit 43c538fa7d
10 changed files with 48 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_house.cpp
View File

@@ -140,8 +140,6 @@ void IncreaseBuildingCount(Town *t, HouseID house_id)
{
HouseClassID class_id = HouseSpec::Get(house_id)->class_id;
if (!_loaded_newgrf_features.has_newhouses) return;
t->cache.building_counts.id_count[house_id]++;
_building_counts.id_count[house_id]++;
@@ -161,8 +159,6 @@ void DecreaseBuildingCount(Town *t, HouseID house_id)
{
HouseClassID class_id = HouseSpec::Get(house_id)->class_id;
if (!_loaded_newgrf_features.has_newhouses) return;
if (t->cache.building_counts.id_count[house_id] > 0) t->cache.building_counts.id_count[house_id]--;
if (_building_counts.id_count[house_id] > 0) _building_counts.id_count[house_id]--;