Merge branch 'smartcmd:main' into main

1 files changed, 10 insertions, 5 deletions

diff --git a/Minecraft.Client/Options.cpp b/Minecraft.Client/Options.cpp
index fac7fe13..ebe1295a 100644
--- a/Minecraft.Client/Options.cpp
+++ b/Minecraft.Client/Options.cpp
@@ -76,7 +76,7 @@ bool Options::Option::isBoolean() const
 
 int	Options::Option::getId() const
 {
-	return (int)(this-options);
+	return static_cast<int>(this - options);
 }
 
 wstring Options::Option::getCaptionId() const
@@ -152,8 +152,8 @@ void Options::init()
 	keyMappings[12] = keyPickItem;
 	keyMappings[13] = keyToggleFog;
 
-	minecraft = NULL;
-	//optionsFile = NULL;
+	minecraft = nullptr;
+	//optionsFile = nullptr;
 
 	difficulty = 2;
 	hideGui = false;
@@ -238,6 +238,10 @@ void Options::set(const Options::Option *item, float fVal)
 	{
 		gamma = fVal;
 	}
+	if (item == Option::RENDER_DISTANCE)
+	{
+		viewDistance = fVal;
+	}
 }
 
 void Options::toggle(const Options::Option *option, int dir)
@@ -292,6 +296,7 @@ float Options::getProgressValue(const Options::Option *item)
     if (item == Option::MUSIC) return music;
     if (item == Option::SOUND) return sound;
     if (item == Option::SENSITIVITY) return sensitivity;
+	if (item == Option::RENDER_DISTANCE) return viewDistance;
     return 0;
 }
 
@@ -412,12 +417,12 @@ void Options::load()
         BufferedReader *br = new BufferedReader(new InputStreamReader( new FileInputStream( optionsFile ) ) );
 
         wstring line = L"";
-        while ((line = br->readLine()) != L"")	// 4J - was check against NULL - do we need to distinguish between empty lines and a fail here?
+        while ((line = br->readLine()) != L"")	// 4J - was check against nullptr - do we need to distinguish between empty lines and a fail here?
 		{
 			// 4J - removed try/catch
 //            try {
                 wstring cmds[2];
-				int splitpos = (int)line.find(L":");
+				size_t splitpos = line.find(L":");
 				if( splitpos == wstring::npos )
 				{
 					cmds[0] = line;