From 74f70c61a37c94727e1411696f050cf588cf3446 Mon Sep 17 00:00:00 2001
From: max-001 <maxsmits21@kpnmail.nl>
Date: Fri, 20 Dec 2024 12:05:52 +0100
Subject: Fix merge issues

---
 src/example/ForestParallaxScript.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/example/ForestParallaxScript.cpp')

diff --git a/src/example/ForestParallaxScript.cpp b/src/example/ForestParallaxScript.cpp
index 782cdf0..27e30eb 100644
--- a/src/example/ForestParallaxScript.cpp
+++ b/src/example/ForestParallaxScript.cpp
@@ -9,7 +9,7 @@ ForestParallaxScript::ForestParallaxScript(float begin_x, float end_x,
 	  end_x(end_x),
 	  name(unique_bg_name) {}
 
-void ForestParallaxScript::update() {
+void ForestParallaxScript::fixed_update(crepe::duration_t dt) {
 	RefVector<Transform> vec_2
 		= this->get_components_by_name<Transform>("forest_bg_2_" + name);
 	RefVector<Transform> vec_3
-- 
cgit v1.2.3