Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -12,7 +12,7 @@ const wstring ClockItem::TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT] = {L"clockP0",L"cl
|
||||
|
||||
ClockItem::ClockItem(int id) : Item(id)
|
||||
{
|
||||
icons = nullptr;
|
||||
icons = NULL;
|
||||
}
|
||||
|
||||
// 4J Added so that we can override the icon id used to calculate the texture UV's for each player
|
||||
@@ -21,7 +21,7 @@ Icon *ClockItem::getIcon(int auxValue)
|
||||
Icon *icon = Item::getIcon(auxValue);
|
||||
Minecraft *pMinecraft = Minecraft::GetInstance();
|
||||
|
||||
if( pMinecraft->player != nullptr && auxValue == 0 )
|
||||
if( pMinecraft->player != NULL && auxValue == 0 )
|
||||
{
|
||||
icon = icons[pMinecraft->player->GetXboxPad()];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user