diff options
| author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-12-22 20:05:02 +0100 |
|---|---|---|
| committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-12-22 20:05:02 +0100 |
| commit | ec69f40540317215d0f30e1f8e43d0e18450f8cc (patch) | |
| tree | 1468a8d5bbf4a8800cee89c9e114d09348fa88bb /src/crepe/system | |
| parent | a600cc55468a6513743ce916aa3da129270c23f0 (diff) | |
`make format`loek/game
Diffstat (limited to 'src/crepe/system')
| -rw-r--r-- | src/crepe/system/AnimatorSystem.cpp | 2 | ||||
| -rw-r--r-- | src/crepe/system/ScriptSystem.cpp | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp index 467d2a2..6c93372 100644 --- a/src/crepe/system/AnimatorSystem.cpp +++ b/src/crepe/system/AnimatorSystem.cpp @@ -30,7 +30,7 @@ void AnimatorSystem::frame_update() { if (animator.elapsed > frame_duration) { animator.elapsed = 0ms; animator.data.frame++; - + if (animator.data.looping && animator.data.frame >= animator.data.cycle_end) animator.data.frame = animator.data.cycle_start; } diff --git a/src/crepe/system/ScriptSystem.cpp b/src/crepe/system/ScriptSystem.cpp index 411a9a3..f1e31f9 100644 --- a/src/crepe/system/ScriptSystem.cpp +++ b/src/crepe/system/ScriptSystem.cpp @@ -36,7 +36,11 @@ void ScriptSystem::update( script->init(); script->initialized = true; } catch (const exception & e) { - Log::logf(Log::Level::WARNING, "Disabled script \"{}\" due to exception in init function: {}", behavior_script.name, e.what()); + Log::logf( + Log::Level::WARNING, + "Disabled script \"{}\" due to exception in init function: {}", + behavior_script.name, e.what() + ); behavior_script.active = false; } } @@ -45,7 +49,11 @@ void ScriptSystem::update( (*script.*update_function)(delta_time); } catch (const exception & e) { // TODO: discern between fixed/frame update - Log::logf(Log::Level::WARNING, "Disabled script \"{}\" due to exception in update function: {}", behavior_script.name, e.what()); + Log::logf( + Log::Level::WARNING, + "Disabled script \"{}\" due to exception in update function: {}", + behavior_script.name, e.what() + ); behavior_script.active = false; } } |