merging aftermath

This commit is contained in:
2025-03-22 11:00:31 +01:00
parent d9ccecfdd8
commit 8aaced68d0
3 changed files with 10 additions and 2 deletions

View File

@@ -1,7 +1,7 @@
{ {
"configurations": [ "configurations": [
{ {
"name": "JMinos", "name": "jminos",
"cppStandard": "c++20", "cppStandard": "c++20",
"compileCommands": ".vscode/compile_commands.json" "compileCommands": ".vscode/compile_commands.json"
} }

View File

@@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Settings.h" #include "../Settings.h"
#include <stack> #include <stack>
#include <memory> #include <memory>

View File

@@ -37,13 +37,17 @@ void Settings::resetSettingsFile() const {
bool Settings::selectNextKeybinds() { bool Settings::selectNextKeybinds() {
if (this->chosenKeybinds < NUMBER_OF_KEYBINDS) { if (this->chosenKeybinds < NUMBER_OF_KEYBINDS) {
this->chosenKeybinds++; this->chosenKeybinds++;
return true;
} }
return false;
} }
bool Settings::selectPreviousKeybinds() { bool Settings::selectPreviousKeybinds() {
if (this->chosenKeybinds > 0) { if (this->chosenKeybinds > 0) {
this->chosenKeybinds--; this->chosenKeybinds--;
return true;
} }
return false;
} }
bool Settings::canModifyCurrentKeybinds() const { bool Settings::canModifyCurrentKeybinds() const {
@@ -57,13 +61,17 @@ void Settings::setGamemode(Gamemode gamemode) {
bool Settings::widenWindow() { bool Settings::widenWindow() {
if (this->windowSizeMode < WINDOW_SIZE_LAST_MODE) { if (this->windowSizeMode < WINDOW_SIZE_LAST_MODE) {
this->windowSizeMode++; this->windowSizeMode++;
return true;
} }
return false;
} }
bool Settings::shortenWindow() { bool Settings::shortenWindow() {
if (this->windowSizeMode > 0) { if (this->windowSizeMode > 0) {
this->windowSizeMode--; this->windowSizeMode--;
return true;
} }
return false;
} }
void Settings::selectPieces(PiecesType type, int value) { void Settings::selectPieces(PiecesType type, int value) {