Merge with upstream
This commit is contained in:
commit
ad1a4ecc68
2031 changed files with 40476 additions and 27116 deletions
|
|
@ -21,7 +21,7 @@ const wstring WoodTile::TEXTURE_NAMES[] = {L"oak", L"spruce", L"birch", L"jungle
|
|||
|
||||
WoodTile::WoodTile(int id) : Tile(id, Material::wood)
|
||||
{
|
||||
icons = NULL;
|
||||
icons = nullptr;
|
||||
}
|
||||
|
||||
unsigned int WoodTile::getDescriptionId(int iData)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue