Merge with upstream
This commit is contained in:
commit
ad1a4ecc68
2031 changed files with 40476 additions and 27116 deletions
|
|
@ -9,8 +9,8 @@ const wstring TheEndPortalFrameTile::TEXTURE_EYE = L"endframe_eye";
|
|||
|
||||
TheEndPortalFrameTile::TheEndPortalFrameTile(int id) : Tile(id, Material::glass, isSolidRender() )
|
||||
{
|
||||
iconTop = NULL;
|
||||
iconEye = NULL;
|
||||
iconTop = nullptr;
|
||||
iconEye = nullptr;
|
||||
}
|
||||
|
||||
Icon *TheEndPortalFrameTile::getTexture(int face, int data)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue