Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Project modernization (#630)

Browse Source 
* 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:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Minecraft.Client/Screen.cpp
View File

@@ -14,13 +14,13 @@
Screen::Screen() // 4J added
{
minecraft = NULL;
minecraft = nullptr;
width = 0;
height = 0;
passEvents = false;
font = NULL;
particles = NULL;
clickedButton = NULL;
font = nullptr;
particles = nullptr;
clickedButton = nullptr;
}
void Screen::render(int xm, int ym, float a)
@@ -36,7 +36,7 @@ void Screen::keyPressed(wchar_t eventCharacter, int eventKey)
{
if (eventKey == Keyboard::KEY_ESCAPE)
{
minecraft->setScreen(NULL);
minecraft->setScreen(nullptr);
// minecraft->grabMouse(); // 4J - removed
}
}
@@ -44,12 +44,12 @@ void Screen::keyPressed(wchar_t eventCharacter, int eventKey)
wstring Screen::getClipboard()
{
#ifdef _WINDOWS64
if (!OpenClipboard(NULL)) return wstring();
if (!OpenClipboard(nullptr)) return wstring();
HANDLE h = GetClipboardData(CF_UNICODETEXT);
wstring out;
if (h)
{
const wchar_t *p = reinterpret_cast<const wchar_t*>(GlobalLock(h));
const wchar_t *p = static_cast<const wchar_t*>(GlobalLock(h));
if (p) { out = p; GlobalUnlock(h); }
}
CloseClipboard();
@@ -62,7 +62,7 @@ wstring Screen::getClipboard()
void Screen::setClipboard(const wstring& str)
{
#ifdef _WINDOWS64
if (!OpenClipboard(NULL)) return;
if (!OpenClipboard(nullptr)) return;
EmptyClipboard();
size_t len = (str.length() + 1) * sizeof(wchar_t);
HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, len);
@@ -89,10 +89,10 @@ void Screen::mouseClicked(int x, int y, int buttonNum)
void Screen::mouseReleased(int x, int y, int buttonNum)
{
if (clickedButton!=NULL && buttonNum==0)
if (clickedButton!=nullptr && buttonNum==0)
{
clickedButton->released(x, y);
clickedButton = NULL;
clickedButton = nullptr;
}
}
@@ -284,7 +284,7 @@ void Screen::renderBackground()
void Screen::renderBackground(int vo)
{
if (minecraft->level != NULL)
if (minecraft->level != nullptr)
{
fillGradient(0, 0, width, height, 0xc0101010, 0xd0101010);
}