* 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
43 lines
974 B
C++
43 lines
974 B
C++
#include "stdafx.h"
|
|
#include "..\..\..\Minecraft.World\ItemInstance.h"
|
|
#if !(defined _XBOX) && !(defined __PSVITA__)
|
|
#include "..\UI\UI.h"
|
|
#endif
|
|
#include "Tutorial.h"
|
|
#include "XuiCraftingTask.h"
|
|
|
|
bool XuiCraftingTask::isCompleted()
|
|
{
|
|
#ifndef __PSVITA__
|
|
// This doesn't seem to work
|
|
//IUIScene_CraftingMenu *craftScene = reinterpret_cast<IUIScene_CraftingMenu *>(tutorial->getScene());
|
|
#ifdef _XBOX
|
|
CXuiSceneCraftingPanel *craftScene = (CXuiSceneCraftingPanel *)(tutorial->getScene());
|
|
#else
|
|
UIScene_CraftingMenu *craftScene = reinterpret_cast<UIScene_CraftingMenu *>(tutorial->getScene());
|
|
#endif
|
|
|
|
bool completed = false;
|
|
|
|
switch(m_type)
|
|
{
|
|
case e_Crafting_SelectGroup:
|
|
if(craftScene != nullptr && craftScene->getCurrentGroup() == m_group)
|
|
{
|
|
completed = true;
|
|
}
|
|
break;
|
|
case e_Crafting_SelectItem:
|
|
if(craftScene != nullptr && craftScene->isItemSelected(m_item))
|
|
{
|
|
completed = true;
|
|
}
|
|
break;
|
|
}
|
|
|
|
return completed;
|
|
#else
|
|
return true;
|
|
#endif
|
|
}
|