aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormax-001 <maxsmits21@kpnmail.nl>2024-12-09 13:32:18 +0100
committermax-001 <maxsmits21@kpnmail.nl>2024-12-09 13:32:18 +0100
commita12986c0855e68ac027c2686223813c112960165 (patch)
treed1026c30e783067b2d9e1c9f65e0c80373aabf01
parentd41730984f971489fb4b14b73ce2888ad1858efe (diff)
Fixed merge issue
-rw-r--r--src/crepe/api/Script.h1
-rw-r--r--src/example/game.cpp4
2 files changed, 0 insertions, 5 deletions
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index e351e6a..d99ab0e 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -7,7 +7,6 @@
#include "../system/CollisionSystem.h"
#include "../types.h"
#include "../util/OptionalRef.h"
-#include "system/CollisionSystem.h"
namespace crepe {
diff --git a/src/example/game.cpp b/src/example/game.cpp
index 2b4e46f..4239c15 100644
--- a/src/example/game.cpp
+++ b/src/example/game.cpp
@@ -66,10 +66,6 @@ class MyScript1 : public Script {
//add collider switch
break;
}
- case Keycode::Q: {
- throw "Test";
- break;
- }
default:
break;
}