merge master into loek/doxygen

3 files changed, 13 insertions, 8 deletions

diff --git a/mwe/gameloop/src/gameObject.cpp b/mwe/gameloop/src/gameObject.cpp
index 809e25f..31503d1 100644
--- a/mwe/gameloop/src/gameObject.cpp
+++ b/mwe/gameloop/src/gameObject.cpp
@@ -24,8 +24,9 @@ void GameObject::setVelX(float value) { velX = value; }
 
 void GameObject::setVelY(float value) { velY = value; }
 
-GameObject::GameObject(std::string name, float x, float y, float width, float height,
-					   float velX, float velY)
+GameObject::GameObject(
+	std::string name, float x, float y, float width, float height, float velX, float velY
+)
 	: name(name),
 	  x(x),
 	  y(y),
diff --git a/mwe/gameloop/src/loopManager.cpp b/mwe/gameloop/src/loopManager.cpp
index fb06995..70cea4c 100644
--- a/mwe/gameloop/src/loopManager.cpp
+++ b/mwe/gameloop/src/loopManager.cpp
@@ -18,11 +18,13 @@ void LoopManager::processInput() {
 			if (event.key.keysym.sym == SDLK_ESCAPE) {
 				gameRunning = false;
 			} else if (event.key.keysym.sym == SDLK_i) {
-				LoopTimer::getInstance().setGameScale(LoopTimer::getInstance().getGameScale()
-													  + 0.1);
+				LoopTimer::getInstance().setGameScale(
+					LoopTimer::getInstance().getGameScale() + 0.1
+				);
 			} else if (event.key.keysym.sym == SDLK_k) {
-				LoopTimer::getInstance().setGameScale(LoopTimer::getInstance().getGameScale()
-													  - 0.1);
+				LoopTimer::getInstance().setGameScale(
+					LoopTimer::getInstance().getGameScale() - 0.1
+				);
 			}
 
 			break;
diff --git a/mwe/gameloop/src/window.cpp b/mwe/gameloop/src/window.cpp
index 8f802e1..df17773 100644
--- a/mwe/gameloop/src/window.cpp
+++ b/mwe/gameloop/src/window.cpp
@@ -36,8 +36,10 @@ bool WindowManager::initWindow() {
 		fprintf(stderr, "Error inititalising SDL.\n");
 		return false;
 	}
-	window = SDL_CreateWindow("SDL Tutorial", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
-							  SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
+	window = SDL_CreateWindow(
+		"SDL Tutorial", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, SCREEN_WIDTH,
+		SCREEN_HEIGHT, SDL_WINDOW_SHOWN
+	);
 	if (!window) {
 		fprintf(stderr, "Error creating SDL Window. \n");
 		return false;