From a12986c0855e68ac027c2686223813c112960165 Mon Sep 17 00:00:00 2001 From: max-001 Date: Mon, 9 Dec 2024 13:32:18 +0100 Subject: Fixed merge issue --- src/crepe/api/Script.h | 1 - src/example/game.cpp | 4 ---- 2 files changed, 5 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3