aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Font.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.Client/Font.cpp')
-rw-r--r--Minecraft.Client/Font.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.Client/Font.cpp b/Minecraft.Client/Font.cpp
index ce2275f6..b6d96e8e 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))
{