diff --git a/project/dedicated_server/CMakeLists.txt b/project/dedicated_server/CMakeLists.txt index 6dc00c0..96ea1a7 100755 --- a/project/dedicated_server/CMakeLists.txt +++ b/project/dedicated_server/CMakeLists.txt @@ -155,5 +155,5 @@ set(CompileFiles ../../src/main.cpp add_executable(mcpe_server ${CompileFiles}) target_link_libraries(mcpe_server raknet ${CMAKE_THREAD_LIBS_INIT}) target_include_directories(mcpe_server PUBLIC - "minecraft-pe-0.6.1/src/" + "../../src/" ) diff --git a/src/client/Minecraft.cpp b/src/client/Minecraft.cpp index 4cc4dbe..bd41577 100755 --- a/src/client/Minecraft.cpp +++ b/src/client/Minecraft.cpp @@ -10,7 +10,6 @@ #if defined(RPI) #define CREATORMODE #endif - #include "../network/RakNetInstance.h" #include "../network/ClientSideNetworkHandler.h" #include "../network/ServerSideNetworkHandler.h" @@ -113,7 +112,7 @@ static void checkGlError(const char* tag) { } #endif /*GLDEBUG*/ } - +#include /*static*/ const char* Minecraft::progressMessages[] = { "Locating server", @@ -1128,6 +1127,7 @@ void Minecraft::init() { options.minecraft = this; options.initDefaultValues(); + #ifndef STANDALONE_SERVER checkGlError("Init enter"); diff --git a/src/client/OptionStrings.cpp b/src/client/OptionStrings.cpp index 9edeb85..2a68643 100755 --- a/src/client/OptionStrings.cpp +++ b/src/client/OptionStrings.cpp @@ -16,3 +16,4 @@ const char* OptionStrings::Controls_IsLefthanded = "ctrl_islefthanded"; const char* OptionStrings::Controls_FeedbackVibration = "feedback_vibration"; const char* OptionStrings::Game_DifficultyLevel = "game_difficulty"; + diff --git a/src/client/Options.cpp b/src/client/Options.cpp index eda251c..682feb4 100755 --- a/src/client/Options.cpp +++ b/src/client/Options.cpp @@ -207,7 +207,7 @@ void Options::update() if (readFloat(value, sens)) { // 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... - sensitivity = 0.3f + std::pow(1.1f * sens, 1.3f) * 0.42f; + sensitivity = sens; } } if (key == OptionStrings::Controls_InvertMouse) { @@ -304,12 +304,12 @@ void Options::load() void Options::save() { StringVector stringVec; + // Login addOptionToSaveOutput(stringVec, OptionStrings::Multiplayer_Username, username); // Game addOptionToSaveOutput(stringVec, OptionStrings::Multiplayer_ServerVisible, serverVisible); addOptionToSaveOutput(stringVec, OptionStrings::Game_DifficultyLevel, difficulty); - // Input addOptionToSaveOutput(stringVec, OptionStrings::Controls_InvertMouse, invertYMouse); addOptionToSaveOutput(stringVec, OptionStrings::Controls_Sensitivity, sensitivity); @@ -317,8 +317,13 @@ void Options::save() addOptionToSaveOutput(stringVec, OptionStrings::Controls_UseTouchScreen, useTouchScreen); addOptionToSaveOutput(stringVec, OptionStrings::Controls_UseTouchJoypad, isJoyTouchArea); addOptionToSaveOutput(stringVec, OptionStrings::Controls_FeedbackVibration, destroyVibration); + // Graphics addOptionToSaveOutput(stringVec, OptionStrings::Graphics_Vsync, vsync); 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 SOUND;