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:
@@ -6,7 +6,7 @@
|
||||
#include "StatTask.h"
|
||||
|
||||
StatTask::StatTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, Stat *stat, int variance /*= 1*/)
|
||||
: TutorialTask( tutorial, descriptionId, enablePreCompletion, NULL )
|
||||
: TutorialTask( tutorial, descriptionId, enablePreCompletion, nullptr )
|
||||
{
|
||||
this->stat = stat;
|
||||
|
||||
@@ -20,6 +20,6 @@ bool StatTask::isCompleted()
|
||||
return true;
|
||||
|
||||
Minecraft *minecraft = Minecraft::GetInstance();
|
||||
bIsCompleted = minecraft->stats[ProfileManager.GetPrimaryPad()]->getTotalValue( stat ) >= (unsigned int)targetValue;
|
||||
bIsCompleted = minecraft->stats[ProfileManager.GetPrimaryPad()]->getTotalValue( stat ) >= static_cast<unsigned int>(targetValue);
|
||||
return bIsCompleted;
|
||||
}
|
||||
Reference in New Issue
Block a user