Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
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 = NULL;
|
||||
icons = nullptr;
|
||||
}
|
||||
|
||||
// 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 != NULL && auxValue == 0 )
|
||||
if( pMinecraft->player != nullptr && auxValue == 0 )
|
||||
{
|
||||
icon = icons[pMinecraft->player->GetXboxPad()];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user