lolcat/minecraft-pe-0.6.1
1
0
Fork 0
mirror of https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1.git synced 2026-03-23 08:23:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

gonna try changing all Options::Option* in the whole project to just Option* not sure if this works but it gets the compiler to shut up. if this breaks everything change all 'Option*' to 'Options::Option*' as it once was.

Browse Source
This commit is contained in:
deepfriedwaffles
2026-03-19 11:10:19 -04:00
parent 04aea27334
commit 05baea1ed4
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/Minecraft.cpp
View File

@@ -1195,7 +1195,7 @@ void Minecraft::setSize(int w, int h) {
int screenHeight = (int)(height * Gui::InvGuiScale); int screenHeight = (int)(height * Gui::InvGuiScale);
// if (platform()) { // if (platform()) {
// float pixelsPerMillimeter = options.getProgressValue(&Options::Option::PIXELS_PER_MILLIMETER); // float pixelsPerMillimeter = options.getProgressValue(&Option::PIXELS_PER_MILLIMETER);
// pixelCalc.setPixelsPerMillimeter(pixelsPerMillimeter); // pixelCalc.setPixelsPerMillimeter(pixelsPerMillimeter);
// pixelCalcUi.setPixelsPerMillimeter(pixelsPerMillimeter * Gui::InvGuiScale); // pixelCalcUi.setPixelsPerMillimeter(pixelsPerMillimeter * Gui::InvGuiScale);
// } // }

8
src/client/gui/components/OptionsPane.cpp
View File

@@ -28,7 +28,7 @@ OptionsGroup& OptionsPane::createOptionsGroup( std::string label ) {
return *newGroup; return *newGroup;
} }
void OptionsPane::createToggle( unsigned int group, std::string label, const Options::Option* option ) { void OptionsPane::createToggle( unsigned int group, std::string label, const Option* option ) {
if(group > children.size()) return; if(group > children.size()) return;
ImageDef def; ImageDef def;
def.setSrc(IntRectangle(160, 206, 39, 20)); def.setSrc(IntRectangle(160, 206, 39, 20));
@@ -42,7 +42,7 @@ void OptionsPane::createToggle( unsigned int group, std::string label, const Opt
setupPositions(); setupPositions();
} }
void OptionsPane::createProgressSlider( Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, float progressMin/*=1.0f*/, float progressMax/*=1.0f */ ) { void OptionsPane::createProgressSlider( Minecraft* minecraft, unsigned int group, std::string label, const Option* option, float progressMin/*=1.0f*/, float progressMax/*=1.0f */ ) {
if(group > children.size()) return; if(group > children.size()) return;
Slider* element = new Slider(minecraft, option, progressMin, progressMax); Slider* element = new Slider(minecraft, option, progressMin, progressMax);
element->width = 100; element->width = 100;
@@ -52,7 +52,7 @@ void OptionsPane::createProgressSlider( Minecraft* minecraft, unsigned int group
setupPositions(); setupPositions();
} }
void OptionsPane::createStepSlider( Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, const std::vector<int>& stepVec ) { void OptionsPane::createStepSlider( Minecraft* minecraft, unsigned int group, std::string label, const Option* option, const std::vector<int>& stepVec ) {
if(group > children.size()) return; if(group > children.size()) return;
Slider* element = new Slider(minecraft, option, stepVec); Slider* element = new Slider(minecraft, option, stepVec);
element->width = 100; element->width = 100;
@@ -60,4 +60,4 @@ void OptionsPane::createStepSlider( Minecraft* minecraft, unsigned int group, st
OptionsItem* item = new OptionsItem(label, element); OptionsItem* item = new OptionsItem(label, element);
((OptionsGroup*)children[group])->addChild(item); ((OptionsGroup*)children[group])->addChild(item);
setupPositions(); setupPositions();
} }

6
src/client/gui/components/OptionsPane.h
View File

@@ -21,9 +21,9 @@ class OptionsPane: public GuiElementContainer
public: public:
OptionsPane(); OptionsPane();
OptionsGroup& createOptionsGroup( std::string label ); OptionsGroup& createOptionsGroup( std::string label );
void createToggle( unsigned int group, std::string label, const Options::Option* option ); void createToggle( unsigned int group, std::string label, const Option* option );
void createProgressSlider(Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, float progressMin=1.0f, float progressMax=1.0f ); void createProgressSlider(Minecraft* minecraft, unsigned int group, std::string label, const Option* option, float progressMin=1.0f, float progressMax=1.0f );
void createStepSlider(Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, const std::vector<int>& stepVec ); void createStepSlider(Minecraft* minecraft, unsigned int group, std::string label, const Option* option, const std::vector<int>& stepVec );
void setupPositions(); void setupPositions();
}; };

8
src/client/gui/screens/OptionsScreen.cpp
View File

@@ -221,9 +221,9 @@ void OptionsScreen::generateOptionScreens() {
// // Graphics Pane // // Graphics Pane
optionPanes[3]->addOptionItem(OPTIONS_FANCY_GRAPHICS, minecraft) optionPanes[3]->addOptionItem(OPTIONS_FANCY_GRAPHICS, minecraft)
// .addOptionItem(&Options::Option::VIEW_BOBBING, minecraft) // .addOptionItem(&Option::VIEW_BOBBING, minecraft)
// .addOptionItem(&Options::Option::AMBIENT_OCCLUSION, minecraft) // .addOptionItem(&Option::AMBIENT_OCCLUSION, minecraft)
// .addOptionItem(&Options::Option::ANAGLYPH, minecraft) // .addOptionItem(&Option::ANAGLYPH, minecraft)
.addOptionItem(OPTIONS_LIMIT_FRAMERATE, minecraft) .addOptionItem(OPTIONS_LIMIT_FRAMERATE, minecraft)
.addOptionItem(OPTIONS_VSYNC, minecraft) .addOptionItem(OPTIONS_VSYNC, minecraft)
.addOptionItem(OPTIONS_RENDER_DEBUG, minecraft) .addOptionItem(OPTIONS_RENDER_DEBUG, minecraft)
@@ -271,4 +271,4 @@ void OptionsScreen::tick() {
currentOptionsGroup->tick(minecraft); currentOptionsGroup->tick(minecraft);
super::tick(); super::tick();
} }