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:
@@ -10,7 +10,7 @@ UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *par
|
||||
// Setup all the Iggy references we need for this scene
|
||||
initialiseMovie();
|
||||
|
||||
FurnaceScreenInput *initData = (FurnaceScreenInput *)_initData;
|
||||
FurnaceScreenInput *initData = static_cast<FurnaceScreenInput *>(_initData);
|
||||
m_furnace = initData->furnace;
|
||||
|
||||
m_labelFurnace.init(m_furnace->getName());
|
||||
@@ -21,9 +21,9 @@ UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *par
|
||||
m_progressFurnaceArrow.init(L"",0,0,24,0);
|
||||
|
||||
Minecraft *pMinecraft = Minecraft::GetInstance();
|
||||
if( pMinecraft->localgameModes[initData->iPad] != NULL )
|
||||
if( pMinecraft->localgameModes[initData->iPad] != nullptr )
|
||||
{
|
||||
TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
|
||||
TutorialMode *gameMode = static_cast<TutorialMode *>(pMinecraft->localgameModes[initData->iPad]);
|
||||
m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
|
||||
gameMode->getTutorial()->changeTutorialState(e_Tutorial_State_Furnace_Menu, this);
|
||||
}
|
||||
@@ -202,7 +202,7 @@ void UIScene_FurnaceMenu::setSectionSelectedSlot(ESceneSection eSection, int x,
|
||||
|
||||
int index = (y * cols) + x;
|
||||
|
||||
UIControl_SlotList *slotList = NULL;
|
||||
UIControl_SlotList *slotList = nullptr;
|
||||
switch( eSection )
|
||||
{
|
||||
case eSectionFurnaceResult:
|
||||
@@ -230,7 +230,7 @@ void UIScene_FurnaceMenu::setSectionSelectedSlot(ESceneSection eSection, int x,
|
||||
|
||||
UIControl *UIScene_FurnaceMenu::getSection(ESceneSection eSection)
|
||||
{
|
||||
UIControl *control = NULL;
|
||||
UIControl *control = nullptr;
|
||||
switch( eSection )
|
||||
{
|
||||
case eSectionFurnaceResult:
|
||||
|
||||
Reference in New Issue
Block a user