diff --git a/source/code/ScoresDisplay.cpp b/source/code/ScoresDisplay.cpp index e2ba857..3efb349 100644 --- a/source/code/ScoresDisplay.cpp +++ b/source/code/ScoresDisplay.cpp @@ -196,7 +196,7 @@ void ScoresDisplay::ProcessInput(const SDL_Event& event, bool& processed) { void ScoresDisplay::Update() { // If the mouse button is released, make bMouseUp equal true - if (!SDL_GetMouseState(nullptr, nullptr)&SDL_BUTTON(1)) { + if ( !(SDL_GetMouseState(nullptr, nullptr)&SDL_BUTTON(1)) ) { bMouseUp=true; } diff --git a/source/code/main.cpp b/source/code/main.cpp index 176c571..f0868c1 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp @@ -1000,7 +1000,7 @@ int PuzzleLevelSelect(int Type) { oldmousex= mousex; // If the mouse button is released, make bMouseUp equal true - if (!SDL_GetMouseState(nullptr, nullptr)&SDL_BUTTON(1)) { + if ( !(SDL_GetMouseState(nullptr, nullptr)&SDL_BUTTON(1)) ) { bMouseUp=true; } @@ -1201,7 +1201,7 @@ struct globalConfig { string savepath; vector search_paths; string puzzleName; - bool allowResize = false; + bool allowResize = true; bool autoScale = true; }; @@ -1226,7 +1226,6 @@ static void ParseArguments(int argc, char* argv[], globalConfig& conf) { ("verbose-basic", "Enables basic verbose messages") ("verbose-game-controller", "Enables verbose messages regarding controllers") ("print-search-path", "Prints the search path and quits") - ("allow-resize", "Allow experimental windows resize support") ("no-auto-scale", "Do not automatically auto scale") ("puzzle-level-file", boost::program_options::value(), "Sets the default puzzle file to load") ("puzzle-single-level", boost::program_options::value(), "Start the specific puzzle level directly") @@ -1308,9 +1307,6 @@ static void ParseArguments(int argc, char* argv[], globalConfig& conf) { singlePuzzle = true; singlePuzzleNr = vm["puzzle-single-level"].as(); } - if(vm.count("allow-resize")) { - conf.allowResize = true; - } if(vm.count("no-auto-scale")) { conf.autoScale = false; } @@ -1972,7 +1968,7 @@ int runGame(Gametype gametype, int level) { } //while event PollEvent - read keys // If the mouse button is released, make bMouseUp equal true - if (!SDL_GetMouseState(nullptr, nullptr)&SDL_BUTTON(1)) { + if (! (SDL_GetMouseState(nullptr, nullptr)&SDL_BUTTON(1)) ) { bMouseUp=true; } diff --git a/source/code/menudef.cpp b/source/code/menudef.cpp index 2847532..15a450d 100644 --- a/source/code/menudef.cpp +++ b/source/code/menudef.cpp @@ -96,7 +96,7 @@ void Button_changekey::doAction() { void InitMenues() { standardButton.setSurfaces(); - standardButton.thefont = &nf_scoreboard_font; + standardButton.thefont = &nf_button_font; } static void runSinglePlayerEndless() {