aboutsummaryrefslogtreecommitdiff
path: root/src/crepe
diff options
context:
space:
mode:
authorWBoerenkamps <wrj.boerenkamps@student.avans.nl>2024-11-03 11:23:54 +0100
committerWBoerenkamps <wrj.boerenkamps@student.avans.nl>2024-11-03 11:23:54 +0100
commit75cf0b8e72aff7072c25ab015ce5c9c64eb3ecc5 (patch)
treedd459130f169a924db0637146d31ed20aaa10d74 /src/crepe
parented8534e2d150428bcbc4a6df8940323ae8db2925 (diff)
parent6aa8fdd04728b6a499f526de727514ae3d0490b4 (diff)
Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/events-poc
Diffstat (limited to 'src/crepe')
-rw-r--r--src/crepe/ScriptSystem.cpp1
-rw-r--r--src/crepe/api/Transform.cpp2
-rw-r--r--src/crepe/api/Transform.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index d00d474..171b490 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -37,6 +37,7 @@ forward_list<Script *> ScriptSystem::get_scripts() {
for (auto behavior_script_ref : behavior_scripts) {
BehaviorScript & behavior_script = behavior_script_ref.get();
+ if (!behavior_script.active) continue;
Script * script = behavior_script.script.get();
if (script == nullptr) continue;
scripts.push_front(script);
diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp
index 626cd67..3b218bc 100644
--- a/src/crepe/api/Transform.cpp
+++ b/src/crepe/api/Transform.cpp
@@ -8,7 +8,7 @@
using namespace crepe::api;
-Transform::Transform(uint32_t game_id, Point & point, double rot, double scale)
+Transform::Transform(uint32_t game_id, const Point & point, double rot, double scale)
: Component(game_id), position(point), rotation(rot), scale(scale) {
dbg_trace();
}
diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h
index c69ec61..c451c16 100644
--- a/src/crepe/api/Transform.h
+++ b/src/crepe/api/Transform.h
@@ -14,7 +14,7 @@ class Transform : public Component {
// works similar (or the same) as those found in GLSL?
public:
- Transform(uint32_t id, Point &, double, double);
+ Transform(uint32_t id, const Point &, double, double);
~Transform();
//! Translation (shift)
Point position;