a9be52c41a
* 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
42 lines
1.0 KiB
C++
42 lines
1.0 KiB
C++
#include "stdafx.h"
|
|
#include "ClockItem.h"
|
|
#include "..\Minecraft.Client\Minecraft.h"
|
|
#include "..\Minecraft.Client\MultiPlayerLocalPlayer.h"
|
|
#include "net.minecraft.world.h"
|
|
|
|
#ifdef __PSVITA__
|
|
const wstring ClockItem::TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT] = {L"clockP0"};
|
|
#else
|
|
const wstring ClockItem::TEXTURE_PLAYER_ICON[XUSER_MAX_COUNT] = {L"clockP0",L"clockP1",L"clockP2",L"clockP3"};
|
|
#endif
|
|
|
|
ClockItem::ClockItem(int id) : Item(id)
|
|
{
|
|
icons = nullptr;
|
|
}
|
|
|
|
// 4J Added so that we can override the icon id used to calculate the texture UV's for each player
|
|
Icon *ClockItem::getIcon(int auxValue)
|
|
{
|
|
Icon *icon = Item::getIcon(auxValue);
|
|
Minecraft *pMinecraft = Minecraft::GetInstance();
|
|
|
|
if( pMinecraft->player != nullptr && auxValue == 0 )
|
|
{
|
|
icon = icons[pMinecraft->player->GetXboxPad()];
|
|
}
|
|
return icon;
|
|
}
|
|
|
|
void ClockItem::registerIcons(IconRegister *iconRegister)
|
|
{
|
|
Item::registerIcons(iconRegister);
|
|
|
|
icons = new Icon *[XUSER_MAX_COUNT];
|
|
|
|
for (int i = 0; i < XUSER_MAX_COUNT; i++)
|
|
{
|
|
icons[i] = iconRegister->registerIcon(TEXTURE_PLAYER_ICON[i]);
|
|
}
|
|
}
|