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:
@@ -22,13 +22,13 @@ bool XuiCraftingTask::isCompleted()
|
||||
switch(m_type)
|
||||
{
|
||||
case e_Crafting_SelectGroup:
|
||||
if(craftScene != NULL && craftScene->getCurrentGroup() == m_group)
|
||||
if(craftScene != nullptr && craftScene->getCurrentGroup() == m_group)
|
||||
{
|
||||
completed = true;
|
||||
}
|
||||
break;
|
||||
case e_Crafting_SelectItem:
|
||||
if(craftScene != NULL && craftScene->isItemSelected(m_item))
|
||||
if(craftScene != nullptr && craftScene->isItemSelected(m_item))
|
||||
{
|
||||
completed = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user