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-20 06:53:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings almost fixed

Browse Source
This commit is contained in:
InviseDivine
2026-03-13 15:57:16 +02:00
parent 37e28d0fcc
commit 6f7812293e
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/dedicated_server/CMakeLists.txt
View File

@@ -155,5 +155,5 @@ set(CompileFiles ../../src/main.cpp
add_executable(mcpe_server ${CompileFiles}) add_executable(mcpe_server ${CompileFiles})
target_link_libraries(mcpe_server raknet ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(mcpe_server raknet ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(mcpe_server PUBLIC target_include_directories(mcpe_server PUBLIC
"minecraft-pe-0.6.1/src/" "../../src/"
) )

4
src/client/Minecraft.cpp
View File

@@ -10,7 +10,6 @@
#if defined(RPI) #if defined(RPI)
#define CREATORMODE #define CREATORMODE
#endif #endif
#include "../network/RakNetInstance.h" #include "../network/RakNetInstance.h"
#include "../network/ClientSideNetworkHandler.h" #include "../network/ClientSideNetworkHandler.h"
#include "../network/ServerSideNetworkHandler.h" #include "../network/ServerSideNetworkHandler.h"
@@ -113,7 +112,7 @@ static void checkGlError(const char* tag) {
} }
#endif /*GLDEBUG*/ #endif /*GLDEBUG*/
} }
#include <fstream>
/*static*/ /*static*/
const char* Minecraft::progressMessages[] = { const char* Minecraft::progressMessages[] = {
"Locating server", "Locating server",
@@ -1128,6 +1127,7 @@ void Minecraft::init()
{ {
options.minecraft = this; options.minecraft = this;
options.initDefaultValues(); options.initDefaultValues();
#ifndef STANDALONE_SERVER #ifndef STANDALONE_SERVER
checkGlError("Init enter"); checkGlError("Init enter");

1
src/client/OptionStrings.cpp
View File

@@ -16,3 +16,4 @@ const char* OptionStrings::Controls_IsLefthanded = "ctrl_islefthanded";
const char* OptionStrings::Controls_FeedbackVibration = "feedback_vibration"; const char* OptionStrings::Controls_FeedbackVibration = "feedback_vibration";
const char* OptionStrings::Game_DifficultyLevel = "game_difficulty"; const char* OptionStrings::Game_DifficultyLevel = "game_difficulty";

9
src/client/Options.cpp
View File

@@ -207,7 +207,7 @@ void Options::update()
if (readFloat(value, sens)) { if (readFloat(value, sens)) {
// sens is in range [0,1] with default/center at 0.5 (for aesthetics) // sens is in range [0,1] with default/center at 0.5 (for aesthetics)
// We wanna map it to something like [0.3, 0.9] BUT keep 0.5 @ ~0.5... // We wanna map it to something like [0.3, 0.9] BUT keep 0.5 @ ~0.5...
sensitivity = 0.3f + std::pow(1.1f * sens, 1.3f) * 0.42f; sensitivity = sens;
} }
} }
if (key == OptionStrings::Controls_InvertMouse) { if (key == OptionStrings::Controls_InvertMouse) {
@@ -304,12 +304,12 @@ void Options::load()
void Options::save() void Options::save()
{ {
StringVector stringVec; StringVector stringVec;
// Login // Login
addOptionToSaveOutput(stringVec, OptionStrings::Multiplayer_Username, username); addOptionToSaveOutput(stringVec, OptionStrings::Multiplayer_Username, username);
// Game // Game
addOptionToSaveOutput(stringVec, OptionStrings::Multiplayer_ServerVisible, serverVisible); addOptionToSaveOutput(stringVec, OptionStrings::Multiplayer_ServerVisible, serverVisible);
addOptionToSaveOutput(stringVec, OptionStrings::Game_DifficultyLevel, difficulty); addOptionToSaveOutput(stringVec, OptionStrings::Game_DifficultyLevel, difficulty);
// Input // Input
addOptionToSaveOutput(stringVec, OptionStrings::Controls_InvertMouse, invertYMouse); addOptionToSaveOutput(stringVec, OptionStrings::Controls_InvertMouse, invertYMouse);
addOptionToSaveOutput(stringVec, OptionStrings::Controls_Sensitivity, sensitivity); addOptionToSaveOutput(stringVec, OptionStrings::Controls_Sensitivity, sensitivity);
@@ -317,8 +317,13 @@ void Options::save()
addOptionToSaveOutput(stringVec, OptionStrings::Controls_UseTouchScreen, useTouchScreen); addOptionToSaveOutput(stringVec, OptionStrings::Controls_UseTouchScreen, useTouchScreen);
addOptionToSaveOutput(stringVec, OptionStrings::Controls_UseTouchJoypad, isJoyTouchArea); addOptionToSaveOutput(stringVec, OptionStrings::Controls_UseTouchJoypad, isJoyTouchArea);
addOptionToSaveOutput(stringVec, OptionStrings::Controls_FeedbackVibration, destroyVibration); addOptionToSaveOutput(stringVec, OptionStrings::Controls_FeedbackVibration, destroyVibration);
// Graphics
addOptionToSaveOutput(stringVec, OptionStrings::Graphics_Vsync, vsync); addOptionToSaveOutput(stringVec, OptionStrings::Graphics_Vsync, vsync);
addOptionToSaveOutput(stringVec, OptionStrings::Graphics_GUIScale, guiScale); addOptionToSaveOutput(stringVec, OptionStrings::Graphics_GUIScale, guiScale);
addOptionToSaveOutput(stringVec, OptionStrings::Game_DifficultyLevel, difficulty);
addOptionToSaveOutput(stringVec, OptionStrings::Graphics_Fancy, fancyGraphics);
//addOptionToSaveOutput(stringVec, OptionStrings::VIEW_BOBBING, fancyGraphics);
// //
// static const Option MUSIC; // static const Option MUSIC;
// static const Option SOUND; // static const Option SOUND;