diff --git a/src/client/Options.cpp b/src/client/Options.cpp index 0785d4d..04479c5 100755 --- a/src/client/Options.cpp +++ b/src/client/Options.cpp @@ -65,17 +65,17 @@ OptionBool useVignette("useVignette", true); OptionBool useTouchscreen("useTouchscreen", true); OptionBool serverVisible("servervisible", true); - +#ifndef __APPLE__ OptionBool foliageTint("foliagetint", true); - +#endif OptionInt fogType("fogType", 0, 0, 2); OptionBool javaHud("javaHud", false); OptionBool betaSky("betaSky", false); - +#ifndef __APPLE__ OptionBool tintedSide("tintedSide", false); - +#endif OptionBool blockOutline("blockOutline", false); OptionBool restoredAnims("restoredAnims", true); @@ -199,17 +199,18 @@ void Options::initTable() { m_options[OPTIONS_BAR_ON_TOP] = &barOnTop; m_options[OPTIONS_ALLOW_SPRINT] = &allowSprint; m_options[OPTIONS_RPI_CURSOR] = &rpiCursor; +#ifndef __APPLE__ m_options[OPTIONS_FOLIAGE_TINT] = &foliageTint; - +#endif // more options yay m_options[OPTIONS_FOG_TYPE] = &fogType; m_options[OPTIONS_DEBUG_STYLE] = &debugStyle; m_options[OPTIONS_BETA_SKY] = &betaSky; - +#ifndef __APPLE__ m_options[OPTIONS_TINTED_SIDE] = &tintedSide; - +#endif m_options[OPTIONS_JAVA_HUD] = &javaHud; m_options[OPTIONS_AUTOJUMP] = &autoJump; diff --git a/src/client/Options.h b/src/client/Options.h index 001a555..2faddfa 100755 --- a/src/client/Options.h +++ b/src/client/Options.h @@ -88,11 +88,15 @@ enum OptionId { OPTIONS_LAST_IP, OPTIONS_RPI_CURSOR, +#ifndef __APPLE__ OPTIONS_FOLIAGE_TINT, - OPTIONS_FOG_TYPE, +#endif + OPTIONS_FOG_TYPE, OPTIONS_JAVA_HUD, OPTIONS_RESTORED_ANIMS, +#ifndef __APPLE__ OPTIONS_TINTED_SIDE, +#endif OPTIONS_BETA_SKY, OPTIONS_BEAUTIFUL_SKY, OPTIONS_VIGNETTE, diff --git a/src/client/renderer/LevelRenderer.cpp b/src/client/renderer/LevelRenderer.cpp index ba57fb6..1ce3ffd 100755 --- a/src/client/renderer/LevelRenderer.cpp +++ b/src/client/renderer/LevelRenderer.cpp @@ -185,11 +185,14 @@ void LevelRenderer::allChanged() lastFogType = mc->options.getIntValue(OPTIONS_FOG_TYPE); +#ifndef __APPLE__ bool tint = mc->options.getBooleanValue(OPTIONS_FOLIAGE_TINT); + bool sideTint = mc->options.getBooleanValue(OPTIONS_TINTED_SIDE); +#else + bool tint = false, sideTint = false; +#endif FoliageColor::setUseTint(tint); GrassColor::setUseTint(tint); - - bool sideTint = mc->options.getBooleanValue(OPTIONS_TINTED_SIDE); TileRenderer::setUseTint(sideTint);