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/console_cmds.cpp
#	src/date.cpp
#	src/economy.cpp
#	src/misc.cpp
#	src/newgrf_house.cpp
This commit is contained in:
Jonathan G Rennison
2020-01-29 19:32:06 +00:00
parent ab1b8ab209 2fee030a26
commit 81a1094cc8
52 changed files with 787 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/newgrf_house.cpp
View File

@@ -64,8 +64,8 @@ HouseResolverObject::HouseResolverObject(HouseID house_id, TileIndex tile, Town
assert(tile == INVALID_TILE || (not_yet_constructed ? IsValidTile(tile) : GetHouseType(tile) == house_id && Town::GetByTile(tile) == town));
this->house_scope = (tile != INVALID_TILE) ?
(ScopeResolver*)new HouseScopeResolver(*this, house_id, tile, town, not_yet_constructed, initial_random_bits, watched_cargo_triggers) :
(ScopeResolver*)new FakeHouseScopeResolver(*this, house_id);
(CommonHouseScopeResolver*)new HouseScopeResolver(*this, house_id, tile, town, not_yet_constructed, initial_random_bits, watched_cargo_triggers) :
(CommonHouseScopeResolver*)new FakeHouseScopeResolver(*this, house_id);
this->town_scope = (town != nullptr) ?
(ScopeResolver*)new TownScopeResolver(*this, town, not_yet_constructed) : // Don't access StorePSA if house is not yet constructed.
@@ -80,6 +80,16 @@ HouseResolverObject::HouseResolverObject(HouseID house_id, TileIndex tile, Town
delete this->town_scope;
}
GrfSpecFeature HouseResolverObject::GetFeature() const
{
return GSF_HOUSES;
}
uint32 HouseResolverObject::GetDebugID() const
{
return HouseSpec::Get(this->house_scope->house_id)->grf_prop.local_id;
}
HouseClassID AllocateHouseClassID(byte grf_class_id, uint32 grfid)
{
/* Start from 1 because 0 means that no class has been assigned. */