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:
@@ -11,7 +11,7 @@ void DeathScreen::init()
|
||||
buttons.push_back(new Button(1, width / 2 - 100, height / 4 + 24 * 3, L"Respawn"));
|
||||
buttons.push_back(new Button(2, width / 2 - 100, height / 4 + 24 * 4, L"Title menu"));
|
||||
|
||||
if (minecraft->user == NULL)
|
||||
if (minecraft->user == nullptr)
|
||||
{
|
||||
buttons[1]->active = false;
|
||||
}
|
||||
@@ -30,12 +30,12 @@ void DeathScreen::buttonClicked(Button *button)
|
||||
if (button->id == 1)
|
||||
{
|
||||
minecraft->player->respawn();
|
||||
minecraft->setScreen(NULL);
|
||||
minecraft->setScreen(nullptr);
|
||||
// minecraft.setScreen(new NewLevelScreen(this));
|
||||
}
|
||||
if (button->id == 2)
|
||||
{
|
||||
minecraft->setLevel(NULL);
|
||||
minecraft->setLevel(nullptr);
|
||||
minecraft->setScreen(new TitleScreen());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user