mirror of
https://github.com/celisej567/mcpe.git
synced 2026-09-23 20:09:46 +03:00
Options Logic Cleanup (#71)
* Output/Logging Overhaul * Added StandardOut class * Renamed LOGX macros to LOG_X * Removed LogMsg macros in favor of LOG_X * Added console window for debug Windows builds * Options Refactor * Moved options loading code from AppPlatform classes to Options class * Added AppPlatform::singleton() * Minecraft::m_options is now only accessible via Minecraft::getOptions() (as it should be) * Making this work with SDL2 next * Options Cleanup for SDL2 * Added AppPlatform::hasFileSystemAccess() * Options won't try to load if hasFileSystemAccess returns false. Emscripten build will be happy. --------- Co-authored-by: Brent Da Mage <BrentDaMage@users.noreply.github.com>
This commit is contained in:
@@ -65,7 +65,7 @@ static std::string ViewDistanceStr(int dist)
|
||||
|
||||
void OptionsScreen::UpdateTexts()
|
||||
{
|
||||
Options& o = m_pMinecraft->m_options;
|
||||
Options& o = *(m_pMinecraft->getOptions());
|
||||
|
||||
m_AOButton.m_text = "Smooth lighting: " + BoolOptionStr(o.m_bAmbientOcclusion);
|
||||
m_invertYButton.m_text = "Invert Y-axis: " + BoolOptionStr(o.m_bInvertMouse);
|
||||
@@ -159,16 +159,13 @@ void OptionsScreen::render(int a, int b, float c)
|
||||
|
||||
void OptionsScreen::removed()
|
||||
{
|
||||
#ifdef ORIGINAL_CODE // Reloading options will reload the options.txt we introduced. Don't do this
|
||||
m_pMinecraft->reloadOptions();
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef ORIGINAL_CODE
|
||||
|
||||
void OptionsScreen::buttonClicked(Button* pButton)
|
||||
{
|
||||
Options& o = m_pMinecraft->m_options;
|
||||
Options& o = *(m_pMinecraft->getOptions());
|
||||
|
||||
bool* pOption = nullptr;
|
||||
switch (pButton->m_buttonId)
|
||||
|
||||
Reference in New Issue
Block a user