From 28614b922fb77149a54da1a87bebfbc98736f296 Mon Sep 17 00:00:00 2001
From: ModMaker101 <119018978+ModMaker101@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:08:36 -0400
Subject: Modernize project codebase (#906)

* 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

* Add safety checks and fix a issue with vector going OOR
---
 Minecraft.Client/Font.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Minecraft.Client/Font.cpp')

diff --git a/Minecraft.Client/Font.cpp b/Minecraft.Client/Font.cpp
index 7ab260f6..db2a18c0 100644
--- a/Minecraft.Client/Font.cpp
+++ b/Minecraft.Client/Font.cpp
@@ -34,7 +34,7 @@ Font::Font(Options *options, const wstring& name, Textures* textures, bool enfor
 	m_textureLocation = textureLocation;
 
 	// Build character map
-	if (charMap != NULL)
+	if (charMap != nullptr)
 	{
 		for(int i = 0; i < charC; i++)
 		{
@@ -383,7 +383,7 @@ int Font::width(const wstring& str)
 {
 	wstring cleanStr = sanitize(str);
 
-	if (cleanStr == L"") return 0;	// 4J - was NULL comparison
+	if (cleanStr == L"") return 0;	// 4J - was nullptr comparison
 	int len = 0;
 
 	for (int i = 0; i < cleanStr.length(); ++i)
@@ -602,7 +602,7 @@ bool Font::AllCharactersValid(const wstring &str)
 			continue;
 		}
 
-		int index = SharedConstants::acceptableLetters.find(c);
+		size_t index = SharedConstants::acceptableLetters.find(c);
 
 		if ((c != ' ') && !(index > 0 && !enforceUnicodeSheet))
 		{
-- 
cgit v1.2.3