merge `master` into `loek/savemgr`

2 files changed, 3 insertions, 3 deletions

diff --git a/mwe/gameloop/include/loopManager.h b/mwe/gameloop/include/loopManager.h
index 1befb69..7d37253 100644
--- a/mwe/gameloop/include/loopManager.h
+++ b/mwe/gameloop/include/loopManager.h
@@ -1,11 +1,11 @@
 #pragma once
-#include "event.h"
 #include "gameObject.h"
 #include "window.h"
 #include <SDL2/SDL.h>
 class LoopManager {
 public:
 	LoopManager();
+	~LoopManager();
 	void setup();
 	void loop();
 
@@ -17,7 +17,7 @@ private:
 	void fixedUpdate();
 	void render();
 	bool gameRunning = false;
-	WindowManager window;
+	WindowManager * window;
 	int timeScale = 1;
 	float accumulator = 0.0;
 	double currentTime;
diff --git a/mwe/gameloop/include/timer.h b/mwe/gameloop/include/timer.h
index 8273746..3c38594 100644
--- a/mwe/gameloop/include/timer.h
+++ b/mwe/gameloop/include/timer.h
@@ -25,7 +25,7 @@ private:
 	double maximumDeltaTime = 0.25;
 	double deltaTime;
 	double frameTargetTime = FPS / 1000;
-	double fixedDeltaTime = 0.01;
+	double fixedDeltaTime = 0.02;
 	double elapsedTime;
 	double elapsedFixedTime;
 	double time;