Merge branch 'jaro/physics-system-improvement' of github.com:lonkaars/crepe into jaro/particle-system-improvement

2 files changed, 3 insertions, 3 deletions

diff --git a/src/crepe/manager/LoopTimerManager.cpp b/src/crepe/manager/LoopTimerManager.cpp
index 9819632..4a3df0a 100644
--- a/src/crepe/manager/LoopTimerManager.cpp
+++ b/src/crepe/manager/LoopTimerManager.cpp
@@ -80,8 +80,8 @@ duration_t LoopTimerManager::get_lag() const {
 	return this->elapsed_time - this->elapsed_fixed_time;
 }
 
-duration_t LoopTimerManager::get_scaled_fixed_delta_time() const {
-	return this->fixed_delta_time * this->time_scale;
+float LoopTimerManager::get_scaled_fixed_delta_time() const {
+	return (this->fixed_delta_time * this->time_scale).count();
 }
 
 void LoopTimerManager::set_fixed_delta_time(float seconds) {
diff --git a/src/crepe/manager/LoopTimerManager.h b/src/crepe/manager/LoopTimerManager.h
index 91403e4..dcbe21c 100644
--- a/src/crepe/manager/LoopTimerManager.h
+++ b/src/crepe/manager/LoopTimerManager.h
@@ -103,7 +103,7 @@ public:
 	 *
 	 * \return The fixed delta time, scaled by the current time scale, in seconds.
 	 */
-	duration_t get_scaled_fixed_delta_time() const;
+	float get_scaled_fixed_delta_time() const;
 
 private:
 	//! Friend relation to use start,enforce_frame_rate,get_lag,update,advance_fixed_update.