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

Merge branch 'master' into jgrpp-beta

Browse Source 
# Conflicts:
#	.github/workflows/ci-build.yml
#	CMakeLists.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/korean.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/spanish.txt
#	src/misc_gui.cpp
#	src/newgrf.cpp
This commit is contained in:
Jonathan G Rennison
2021-10-28 23:51:24 +01:00
parent 81290df946 909f3f25bd
commit da282c3ecc
44 changed files with 315 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/newgrf_canal.cpp
View File

@@ -49,8 +49,6 @@ struct CanalResolverObject : public ResolverObject {
}
}
const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const override;
GrfSpecFeature GetFeature() const override;
uint32 GetDebugID() const override;
};
@@ -108,14 +106,6 @@ struct CanalResolverObject : public ResolverObject {
return UINT_MAX;
}
/* virtual */ const SpriteGroup *CanalResolverObject::ResolveReal(const RealSpriteGroup *group) const
{
if (group->loaded.empty()) return nullptr;
return group->loaded[0];
}
GrfSpecFeature CanalResolverObject::GetFeature() const
{
return GSF_CANALS;