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:
@@ -35,7 +35,7 @@ void TextEditScreen::removed()
|
||||
Keyboard::enableRepeatEvents(false);
|
||||
if (minecraft->level->isClientSide)
|
||||
{
|
||||
minecraft->getConnection(0)->send( shared_ptr<SignUpdatePacket>( new SignUpdatePacket(sign->x, sign->y, sign->z, sign->IsVerified(), sign->IsCensored(), sign->GetMessages()) ) );
|
||||
minecraft->getConnection(0)->send(std::make_shared<SignUpdatePacket>(sign->x, sign->y, sign->z, sign->IsVerified(), sign->IsCensored(), sign->GetMessages()));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -52,7 +52,7 @@ void TextEditScreen::buttonClicked(Button *button)
|
||||
if (button->id == 0)
|
||||
{
|
||||
sign->setChanged();
|
||||
minecraft->setScreen(NULL);
|
||||
minecraft->setScreen(nullptr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ void TextEditScreen::render(int xm, int ym, float a)
|
||||
drawCenteredString(font, title, width / 2, 40, 0xffffff);
|
||||
|
||||
glPushMatrix();
|
||||
glTranslatef((float)width / 2, (float)height / 2, 50);
|
||||
glTranslatef(static_cast<float>(width) / 2, static_cast<float>(height) / 2, 50);
|
||||
float ss = 60 / (16 / 25.0f);
|
||||
glScalef(-ss, -ss, -ss);
|
||||
glRotatef(180, 0, 1, 0);
|
||||
|
||||
Reference in New Issue
Block a user