diff --git a/Minecraft.Client/Options.cpp b/Minecraft.Client/Options.cpp index 3dabbec4..bc4fa88c 100644 --- a/Minecraft.Client/Options.cpp +++ b/Minecraft.Client/Options.cpp @@ -29,7 +29,7 @@ const Options::Option Options::Option::options[18] = Options::Option(L"options.difficulty", false, false), Options::Option(L"options.graphics", false, false), Options::Option(L"options.ao", false, true), - Options::Option(L"options.MipmapsBlend", false, false), + Options::Option(L"options.mipmapsBlend", false, false), Options::Option(L"options.guiScale", false, false), Options::Option(L"options.fov", true, false), Options::Option(L"options.gamma", true, false), @@ -121,7 +121,7 @@ void Options::init() advancedOpengl = false; framerateLimit = 0; fancyGraphics = true; - MipmapsBlend = false; + mipmapsBlend = false; ambientOcclusion = true; renderClouds = true; skin = L"Default"; @@ -253,7 +253,7 @@ void Options::set(const Options::Option *item, float fVal) } if (item == Option::MIPMAPS_BLEND) { - MipmapsBlend = fVal; + mipmapsBlend = fVal; } if (item == Option::AMBIENT_OCCLUSION) { @@ -302,7 +302,7 @@ void Options::toggle(const Options::Option *option, int dir) } if (option == Option::MIPMAPS_BLEND) { - MipmapsBlend = !MipmapsBlend; + mipmapsBlend = !mipmapsBlend; minecraft->textures->reloadAll(); } @@ -320,7 +320,7 @@ float Options::getProgressValue(const Options::Option *item) if (item == Option::RENDER_DISTANCE) return viewDistance; if (item == Option::GRAPHICS) return fancyGraphics; if (item == Option::AMBIENT_OCCLUSION) return ambientOcclusion; - if (item == Option::MIPMAPS_BLEND) return MipmapsBlend; + if (item == Option::MIPMAPS_BLEND) return mipmapsBlend; return 0; } @@ -474,7 +474,7 @@ void Options::load() if (cmds[0] == L"difficulty") difficulty = _fromString(cmds[1]); if (cmds[0] == L"fancyGraphics") fancyGraphics = cmds[1]==L"true"; if (cmds[0] == L"ao") ambientOcclusion = cmds[1]==L"true"; - if (cmds[0] == L"betterWater") betterWater = cmds[1]==L"false"; + if (cmds[0] == L"mipmapsBlend") mipmapsBlend = cmds[1]==L"false"; if (cmds[0] == L"clouds") renderClouds = cmds[1]==L"true"; if (cmds[0] == L"advancedTooltips") advancedTooltips = cmds[1]==L"false"; if (cmds[0] == L"skin") skin = cmds[1]; @@ -533,7 +533,7 @@ void Options::save() dos.writeChars(L"difficulty:" + std::to_wstring(difficulty)); dos.writeChars(L"fancyGraphics:" + wstring(fancyGraphics ? L"true" : L"false")); dos.writeChars(ambientOcclusion ? L"ao:true" : L"ao:false"); - dos.writeChars(betterWater ? L"betterWater:true" : L"betterWater:false"); + dos.writeChars(mipmapsBlend ? L"mipmapsBlend:true" : L"mipmapsBlend:false"); dos.writeChars(renderClouds ? L"clouds:true" : L"clouds:false"); dos.writeChars(advancedTooltips ? L"advancedTooltips:true" : L"advancedTooltips:false"); dos.writeChars(L"skin:" + skin); diff --git a/Minecraft.Client/Options.h b/Minecraft.Client/Options.h index 5847fe82..c117bf31 100644 --- a/Minecraft.Client/Options.h +++ b/Minecraft.Client/Options.h @@ -69,7 +69,7 @@ public: int framerateLimit; bool fancyGraphics; bool ambientOcclusion; - bool MipmapsBlend; + bool mipmapsBlend; bool renderClouds; wstring skin; diff --git a/Minecraft.Client/Texture.cpp b/Minecraft.Client/Texture.cpp index a49b447d..4a3a9d9d 100644 --- a/Minecraft.Client/Texture.cpp +++ b/Minecraft.Client/Texture.cpp @@ -718,7 +718,7 @@ int Texture::crispBlend(int c0, int c1) int a1 = static_cast(((c1 & 0xff000000) >> 24)) & 0xff; // continue with crisp blend if it's likely to be an opaque/cutout tile in the atlas - if (a0 >= 0xfa || a1 >= 0xfa || !Minecraft::GetInstance()->options->MipmapsBlend) + if (a0 >= 0xfa || a1 >= 0xfa || !Minecraft::GetInstance()->options->mipmapsBlend) { int a = 255;