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,11 +10,11 @@ namespace WFC = Windows::Foundation::Collections;
|
||||
namespace MXSA = Microsoft::Xbox::Services::Achievements;
|
||||
namespace CC = concurrency;
|
||||
|
||||
GameProgress *GameProgress::instance = NULL;
|
||||
GameProgress *GameProgress::instance = nullptr;
|
||||
|
||||
void GameProgress::Flush(int iPad)
|
||||
{
|
||||
if (instance == NULL)
|
||||
if (instance == nullptr)
|
||||
instance = new GameProgress();
|
||||
|
||||
instance->updatePlayer(iPad);
|
||||
@@ -22,7 +22,7 @@ void GameProgress::Flush(int iPad)
|
||||
|
||||
void GameProgress::Tick()
|
||||
{
|
||||
if (instance == NULL)
|
||||
if (instance == nullptr)
|
||||
instance = new GameProgress();
|
||||
|
||||
long long currentTime = System::currentTimeMillis();
|
||||
@@ -103,5 +103,5 @@ void GameProgress::updatePlayer(int iPad)
|
||||
|
||||
float GameProgress::calcGameProgress(int achievementsUnlocked)
|
||||
{
|
||||
return (float) achievementsUnlocked / 0.60f;
|
||||
return static_cast<float>(achievementsUnlocked) / 0.60f;
|
||||
}
|
||||
Reference in New Issue
Block a user