Fixed some linux warnings

and removed vcxproj.user

Author: CosminPerRam

.gitignore

@@ -7,4 +7,6 @@
 
 /resources/*.txt
 
+*.user
+
 *.ini

Blockodu.vcxproj.user

@@ -20,7 +20,7 @@ namespace Settings
 		inline static unsigned refreshRateImgui;
 
 		inline static bool vsync;
-		inline static int aalevel; //0 - None, 1 - 2x, 2 - 4x, 3 - 8x, 4 - 16x
+		inline static unsigned aalevel; //0 - None, 1 - 2x, 2 - 4x, 3 - 8x, 4 - 16x
 
 		static void defaultValues();
 		static void save(std::stringstream& sstream);

include/settings.h

@@ -15,6 +15,11 @@ namespace Random
 	int getNumberInBetween(unsigned a, unsigned b);
 }
 
+namespace Math
+{
+	unsigned pow(unsigned base, unsigned power);
+}
+
 namespace Files
 {
 	bool exists(const char* fileName);

include/utilities.h

@@ -5,6 +5,7 @@
 
 #include "spacing.h"
 #include "audio.h"
+#include "utilities.h"
 
 Score *Game::theScore = nullptr;
 Table *Game::theTable = nullptr;
@@ -84,7 +85,7 @@ void Game::destroyWindow() {
 
 void Game::initializeWindow() {
     sf::ContextSettings settings;
-    settings.antialiasingLevel = Settings::General::aalevel == 0 ? 0 : (unsigned)pow(2, Settings::General::aalevel);
+    settings.antialiasingLevel = Settings::General::aalevel == 0 ? 0 : Math::pow(2u, Settings::General::aalevel);
 
     window = new sf::RenderWindow(sf::VideoMode(WINDOW_HEIGHT, WINDOW_WIDTH), "Blockudoku", sf::Style::Close, settings);
 

src/game.cpp

@@ -2,7 +2,6 @@
 #include "imguiInterface.h"
 
 #include <numeric>
-#include <execution>
 
 #include "imgui-SFML.h"
 #include <SFML/Window/Event.hpp>
@@ -35,7 +34,7 @@ void ImguiInterface::Data::update() {
 	if (data.historyFps.size() > HISTORYFPS_COUNT)
 		data.historyFps.erase(data.historyFps.begin());
 
-	data.averageFps = static_cast<unsigned>(std::reduce(std::execution::par, data.historyFps.begin(), data.historyFps.end()) / data.historyFps.size());
+	data.averageFps = static_cast<unsigned>(std::reduce(data.historyFps.begin(), data.historyFps.end()) / data.historyFps.size());
 
 	data.latestFrametime = Game::fetchFrametime();
 }
@@ -165,7 +164,7 @@ void ImguiInterface::draw(sf::RenderWindow& window) {
 				else if (Settings::Gameplay::blockModel == -2)
 					ImGui::Text("Custom");
 				else
-					ImGui::Text(structures::grouped[Settings::Gameplay::blockModel]->name);
+					ImGui::TextUnformatted( structures::grouped[Settings::Gameplay::blockModel]->name);
 
 				if (Settings::Gameplay::blockModel == -2) {
 					ImGui::Separator();

src/imguiInterface.cpp

@@ -1,6 +1,4 @@
 
-#pragma once
-
 #include "settings.h"
 #include "utilities.h"
 #include "game.h"

src/settings.cpp

@@ -13,6 +13,13 @@ int Random::getNumberInBetween(unsigned a, unsigned b) {
     return distr(gen);
 }
 
+unsigned Math::pow(unsigned base, unsigned power) {
+    if (power == 0)
+        return 1;
+
+    return base * pow(base, power - 1);
+}
+
 bool Files::exists(const char* fileName) {
     return std::ifstream(fileName).good();
 }