aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--game/coins/CoinPool.cpp3
-rw-r--r--game/coins/CoinPool.h3
-rw-r--r--game/coins/CoinScript.cpp8
-rw-r--r--game/coins/CoinSubScene.cpp14
-rw-r--r--game/coins/CoinSystemScript.cpp11
-rw-r--r--game/coins/CoinSystemScript.h11
-rw-r--r--game/hud/HudConfig.h2
-rw-r--r--game/hud/HudScript.cpp11
-rw-r--r--game/hud/HudScript.h6
-rw-r--r--game/hud/HudSubScene.cpp9
-rw-r--r--game/hud/HudSubScene.h3
-rw-r--r--game/hud/SpeedScript.cpp7
-rw-r--r--game/hud/SpeedScript.h4
-rw-r--r--game/menus/ButtonNextMainMenuScript.cpp7
-rw-r--r--game/menus/ButtonSetMainMenuScript.cpp5
-rw-r--r--game/menus/FloatingWindowSubScene.cpp2
-rw-r--r--game/menus/FloatingWindowSubScene.h2
-rw-r--r--game/menus/IFloatingWindowScript.cpp5
-rw-r--r--game/menus/IFloatingWindowScript.h1
-rw-r--r--game/menus/endgame/EndGameSubScene.cpp11
-rw-r--r--game/menus/endgame/EndGameSubScript.cpp11
-rw-r--r--game/menus/endgame/EndGameSubScript.h3
22 files changed, 80 insertions, 59 deletions
diff --git a/game/coins/CoinPool.cpp b/game/coins/CoinPool.cpp
index 439b3b3..1d2d0de 100644
--- a/game/coins/CoinPool.cpp
+++ b/game/coins/CoinPool.cpp
@@ -1,8 +1,5 @@
#include "CoinPool.h"
-#include "CoinScript.h"
#include "CoinSubScene.h"
-#include "api/BehaviorScript.h"
-#include "api/GameObject.h"
using namespace crepe;
using namespace std;
diff --git a/game/coins/CoinPool.h b/game/coins/CoinPool.h
index 83058f7..d94c352 100644
--- a/game/coins/CoinPool.h
+++ b/game/coins/CoinPool.h
@@ -1,7 +1,6 @@
#pragma once
-#include "api/Scene.h"
-
+#include <crepe/api/Scene.h>
class CoinPool {
public:
diff --git a/game/coins/CoinScript.cpp b/game/coins/CoinScript.cpp
index 2ecbb98..3d18780 100644
--- a/game/coins/CoinScript.cpp
+++ b/game/coins/CoinScript.cpp
@@ -1,11 +1,13 @@
#include "CoinScript.h"
-#include "api/CircleCollider.h"
-#include "api/Sprite.h"
+
#include "manager/SaveManager.h"
+
#include "../Config.h"
-#include "../Events.h"
#include "../hud/HudScript.h"
+#include <crepe/api/CircleCollider.h>
+#include <crepe/api/Sprite.h>
+
using namespace crepe;
using namespace std;
diff --git a/game/coins/CoinSubScene.cpp b/game/coins/CoinSubScene.cpp
index 9c9caa3..63f9e89 100644
--- a/game/coins/CoinSubScene.cpp
+++ b/game/coins/CoinSubScene.cpp
@@ -1,13 +1,13 @@
#include "CoinSubScene.h"
-#include "api/Animator.h"
-#include "api/BehaviorScript.h"
-#include "api/CircleCollider.h"
-#include "api/Rigidbody.h"
-#include "api/Scene.h"
-#include "api/AudioSource.h"
-#include "CoinScript.h"
+
#include "../Config.h"
+#include <crepe/api/Animator.h>
+#include <crepe/api/CircleCollider.h>
+#include <crepe/api/Rigidbody.h>
+#include <crepe/api/Scene.h>
+#include <crepe/api/AudioSource.h>
+
using namespace crepe;
using namespace std;
diff --git a/game/coins/CoinSystemScript.cpp b/game/coins/CoinSystemScript.cpp
index 573c825..a58e3fd 100644
--- a/game/coins/CoinSystemScript.cpp
+++ b/game/coins/CoinSystemScript.cpp
@@ -1,11 +1,12 @@
#include "CoinSystemScript.h"
-#include "CoinPool.h"
-#include "api/CircleCollider.h"
-#include "api/Metadata.h"
-#include "api/Sprite.h"
-#include "api/Transform.h"
+
#include <random>
+#include <crepe/api/CircleCollider.h>
+#include <crepe/api/Metadata.h>
+#include <crepe/api/Sprite.h>
+#include <crepe/api/Transform.h>
+
using namespace crepe;
using namespace std;
diff --git a/game/coins/CoinSystemScript.h b/game/coins/CoinSystemScript.h
index c65b533..b432f68 100644
--- a/game/coins/CoinSystemScript.h
+++ b/game/coins/CoinSystemScript.h
@@ -1,13 +1,14 @@
#pragma once
-#include "types.h"
#include <string>
-#include "api/CircleCollider.h"
-#include "api/Script.h"
-#include "api/Sprite.h"
-#include "api/Transform.h"
#include <random>
+#include <crepe/types.h>
+#include <crepe/api/CircleCollider.h>
+#include <crepe/api/Script.h>
+#include <crepe/api/Sprite.h>
+#include <crepe/api/Transform.h>
+
class CoinSystemScript : public crepe::Script {
private:
struct CoinData{
diff --git a/game/hud/HudConfig.h b/game/hud/HudConfig.h
index e3497fb..2da3b66 100644
--- a/game/hud/HudConfig.h
+++ b/game/hud/HudConfig.h
@@ -1,5 +1,5 @@
#pragma once
-#include "types.h"
+#include <crepe/types.h>
static constexpr crepe::vec2 TOP_LEFT = {-530,-230};
static constexpr const char* HUD_DISTANCE = "hud_distance";
diff --git a/game/hud/HudScript.cpp b/game/hud/HudScript.cpp
index 165f245..4aca15e 100644
--- a/game/hud/HudScript.cpp
+++ b/game/hud/HudScript.cpp
@@ -1,12 +1,15 @@
#include "HudScript.h"
-#include "api/Text.h"
-#include "api/Transform.h"
-#include "manager/SaveManager.h"
+#include "HudConfig.h"
+
#include "../Config.h"
#include "../Events.h"
-#include "HudConfig.h"
+
#include <climits>
+#include <crepe/api/Text.h>
+#include <crepe/api/Transform.h>
+#include <crepe/manager/SaveManager.h>
+
using namespace crepe;
using namespace std;
diff --git a/game/hud/HudScript.h b/game/hud/HudScript.h
index cf939f4..5b9ec17 100644
--- a/game/hud/HudScript.h
+++ b/game/hud/HudScript.h
@@ -1,8 +1,8 @@
#pragma once
-#include "api/Event.h"
-#include "api/Script.h"
-#include "manager/SaveManager.h"
+#include <crepe/api/Event.h>
+#include <crepe/api/Script.h>
+#include <crepe/manager/SaveManager.h>
struct GetCoinEvent : public crepe::Event {
int amount_of_coins;
diff --git a/game/hud/HudSubScene.cpp b/game/hud/HudSubScene.cpp
index 4995624..8b87a2e 100644
--- a/game/hud/HudSubScene.cpp
+++ b/game/hud/HudSubScene.cpp
@@ -1,9 +1,12 @@
#include "HudSubScene.h"
-#include "api/GameObject.h"
-#include "api/Text.h"
-#include "../Config.h"
#include "HudConfig.h"
+#include "../Config.h"
+
+#include <crepe/api/GameObject.h>
+#include <crepe/api/Text.h>
+
+
using namespace crepe;
using namespace std;
diff --git a/game/hud/HudSubScene.h b/game/hud/HudSubScene.h
index 711a34d..be696e9 100644
--- a/game/hud/HudSubScene.h
+++ b/game/hud/HudSubScene.h
@@ -1,6 +1,7 @@
#pragma once
-#include "api/Scene.h"
+#include <crepe/api/Scene.h>
+
class HudSubScene
{
public:
diff --git a/game/hud/SpeedScript.cpp b/game/hud/SpeedScript.cpp
index 69534d9..c9f7188 100644
--- a/game/hud/SpeedScript.cpp
+++ b/game/hud/SpeedScript.cpp
@@ -1,7 +1,8 @@
#include "SpeedScript.h"
-#include "api/Event.h"
-#include "api/KeyCodes.h"
-#include "manager/LoopTimerManager.h"
+
+#include <crepe/api/Event.h>
+#include <crepe/api/KeyCodes.h>
+#include <crepe/manager/LoopTimerManager.h>
using namespace crepe;
using namespace std;
diff --git a/game/hud/SpeedScript.h b/game/hud/SpeedScript.h
index 8bd7271..76ada4f 100644
--- a/game/hud/SpeedScript.h
+++ b/game/hud/SpeedScript.h
@@ -1,7 +1,7 @@
#pragma once
-#include "api/Script.h"
-#include "manager/SaveManager.h"
+#include <crepe/api/Script.h>
+#include <crepe/manager/SaveManager.h>
class SpeedScript : public crepe::Script {
public:
diff --git a/game/menus/ButtonNextMainMenuScript.cpp b/game/menus/ButtonNextMainMenuScript.cpp
index d7f48e2..7ebb2cf 100644
--- a/game/menus/ButtonNextMainMenuScript.cpp
+++ b/game/menus/ButtonNextMainMenuScript.cpp
@@ -1,11 +1,14 @@
#include "ButtonNextMainMenuScript.h"
#include "MenusConfig.h"
#include "ValueBroker.h"
-#include "api/AudioSource.h"
+
#include "manager/SaveManager.h"
-#include "types.h"
+
#include "../Config.h"
+#include <crepe/api/AudioSource.h>
+#include <crepe/types.h>
+
using namespace crepe;
using namespace std;
diff --git a/game/menus/ButtonSetMainMenuScript.cpp b/game/menus/ButtonSetMainMenuScript.cpp
index e967dfb..1e4179c 100644
--- a/game/menus/ButtonSetMainMenuScript.cpp
+++ b/game/menus/ButtonSetMainMenuScript.cpp
@@ -1,7 +1,8 @@
#include "ButtonSetMainMenuScript.h"
#include "MenusConfig.h"
-#include "api/AudioSource.h"
-#include "types.h"
+
+#include <crepe/api/AudioSource.h>
+#include <crepe/types.h>
using namespace crepe;
using namespace std;
diff --git a/game/menus/FloatingWindowSubScene.cpp b/game/menus/FloatingWindowSubScene.cpp
index 16963bb..640d151 100644
--- a/game/menus/FloatingWindowSubScene.cpp
+++ b/game/menus/FloatingWindowSubScene.cpp
@@ -1,8 +1,8 @@
#include "FloatingWindowSubScene.h"
#include "MenusConfig.h"
-#include "types.h"
+#include <crepe/types.h>
#include <crepe/api/GameObject.h>
#include <crepe/api/Scene.h>
#include <crepe/api/Sprite.h>
diff --git a/game/menus/FloatingWindowSubScene.h b/game/menus/FloatingWindowSubScene.h
index a0bd854..1ce7c38 100644
--- a/game/menus/FloatingWindowSubScene.h
+++ b/game/menus/FloatingWindowSubScene.h
@@ -1,6 +1,6 @@
#pragma once
-#include "types.h"
+#include <crepe/types.h>
#include <crepe/api/Scene.h>
class FloatingWindowSubScene {
diff --git a/game/menus/IFloatingWindowScript.cpp b/game/menus/IFloatingWindowScript.cpp
index ce84de7..8d6c838 100644
--- a/game/menus/IFloatingWindowScript.cpp
+++ b/game/menus/IFloatingWindowScript.cpp
@@ -1,6 +1,7 @@
#include "IFloatingWindowScript.h"
-#include "api/Sprite.h"
-#include "types.h"
+
+#include <crepe/api/Sprite.h>
+#include <crepe/types.h>
using namespace crepe;
diff --git a/game/menus/IFloatingWindowScript.h b/game/menus/IFloatingWindowScript.h
index 9775726..dff4091 100644
--- a/game/menus/IFloatingWindowScript.h
+++ b/game/menus/IFloatingWindowScript.h
@@ -1,6 +1,7 @@
#pragma once
#include <crepe/api/Script.h>
+
#include <string>
class IFloatingWindowScript : public virtual crepe::Script {
diff --git a/game/menus/endgame/EndGameSubScene.cpp b/game/menus/endgame/EndGameSubScene.cpp
index 5360c96..c97ce52 100644
--- a/game/menus/endgame/EndGameSubScene.cpp
+++ b/game/menus/endgame/EndGameSubScene.cpp
@@ -1,14 +1,17 @@
#include "EndGameSubScene.h"
+#include "EndGameSubScript.h"
+
#include "../FloatingWindowSubScene.h"
#include "../ButtonSubScene.h"
-#include <crepe/api/Text.h>
+#include "../../Config.h"
+
#include <string>
+
#include <crepe/api/GameObject.h>
#include <crepe/api/BehaviorScript.h>
-#include "EndGameSubScript.h"
-#include "types.h"
-#include "../../Config.h"
+#include <crepe/api/Text.h>
+#include <crepe/types.h>
using namespace crepe;
using namespace std;
diff --git a/game/menus/endgame/EndGameSubScript.cpp b/game/menus/endgame/EndGameSubScript.cpp
index 2be6931..2204df0 100644
--- a/game/menus/endgame/EndGameSubScript.cpp
+++ b/game/menus/endgame/EndGameSubScript.cpp
@@ -1,12 +1,15 @@
#include "EndGameSubScript.h"
+
#include "../IFloatingWindowScript.h"
-#include "api/Button.h"
-#include "api/Sprite.h"
-#include "api/Text.h"
-#include "types.h"
#include "../../Events.h"
+
#include <string>
+#include <crepe/api/Button.h>
+#include <crepe/api/Sprite.h>
+#include <crepe/api/Text.h>
+#include <crepe/types.h>
+
using namespace crepe;
EndGameSubScript::EndGameSubScript(const std::string & tag){
diff --git a/game/menus/endgame/EndGameSubScript.h b/game/menus/endgame/EndGameSubScript.h
index 2ce3ec7..4b63a4e 100644
--- a/game/menus/endgame/EndGameSubScript.h
+++ b/game/menus/endgame/EndGameSubScript.h
@@ -1,7 +1,8 @@
#pragma once
#include "../IFloatingWindowScript.h"
-#include "api/Event.h"
+
+#include <crepe/api/Event.h>
#include <crepe/api/Script.h>
class EndGameSubScript : public IFloatingWindowScript {