gamestate: Move animation property handling to helper function.

Author: heinezen

libopenage/gamestate/system/CMakeLists.txt

@@ -3,5 +3,6 @@ add_sources(libopenage
     apply_effect.cpp
     idle.cpp
     move.cpp
+    property.cpp
     types.cpp
 )

libopenage/gamestate/system/idle.cpp

@@ -15,6 +15,7 @@
 #include "gamestate/component/api/idle.h"
 #include "gamestate/component/types.h"
 #include "gamestate/game_entity.h"
+#include "gamestate/system/property.h"
 
 
 namespace openage::gamestate::system {
@@ -27,18 +28,10 @@ const time::time_t Idle::idle(const std::shared_ptr<gamestate::GameEntity> &enti
 
 	auto idle_component = std::dynamic_pointer_cast<component::Idle>(
 		entity->get_component(component::component_t::IDLE));
-	auto ability = idle_component->get_ability();
-	if (api::APIAbility::check_property(ability, api::ability_property_t::ANIMATED)) {
-		auto property = api::APIAbility::get_property(ability, api::ability_property_t::ANIMATED);
-		auto animations = api::APIAbilityProperty::get_animations(property);
-		auto animation_paths = api::APIAnimation::get_animation_paths(animations);
-
-		if (animation_paths.size() > 0) [[likely]] {
-			entity->render_update(start_time, animation_paths[0]);
-		}
-	}
 
-	// TODO: play sound
+	// properties
+	auto ability = idle_component->get_ability();
+	handle_animated(entity, ability, start_time);
 
 	return time::time_t::from_int(0);
 }

libopenage/gamestate/system/move.cpp

@@ -26,6 +26,7 @@
 #include "gamestate/game_entity.h"
 #include "gamestate/game_state.h"
 #include "gamestate/map.h"
+#include "gamestate/system/property.h"
 #include "pathfinding/path.h"
 #include "pathfinding/pathfinder.h"
 #include "util/fixed_point.h"
@@ -171,15 +172,7 @@ const time::time_t Move::move_default(const std::shared_ptr<gamestate::GameEntit
 
 	// properties
 	auto ability = move_component->get_ability();
-	if (api::APIAbility::check_property(ability, api::ability_property_t::ANIMATED)) {
-		auto property = api::APIAbility::get_property(ability, api::ability_property_t::ANIMATED);
-		auto animations = api::APIAbilityProperty::get_animations(property);
-		auto animation_paths = api::APIAnimation::get_animation_paths(animations);
-
-		if (animation_paths.size() > 0) [[likely]] {
-			entity->render_update(start_time, animation_paths[0]);
-		}
-	}
+	handle_animated(entity, ability, start_time);
 
 	return total_time;
 }

libopenage/gamestate/system/property.cpp

@@ -0,0 +1,32 @@
+// Copyright 2024-2024 the openage authors. See copying.md for legal info.
+
+#include "property.h"
+
+#include "gamestate/api/ability.h"
+#include "gamestate/api/animation.h"
+#include "gamestate/api/property.h"
+#include "gamestate/game_entity.h"
+
+
+namespace openage::gamestate::system {
+
+bool handle_animated(const std::shared_ptr<gamestate::GameEntity> &entity,
+                     const nyan::Object &ability,
+                     const time::time_t &start_time) {
+	bool animated = api::APIAbility::check_property(ability, api::ability_property_t::ANIMATED);
+
+	if (animated) {
+		auto property = api::APIAbility::get_property(ability, api::ability_property_t::ANIMATED);
+		auto animations = api::APIAbilityProperty::get_animations(property);
+		auto animation_paths = api::APIAnimation::get_animation_paths(animations);
+
+		if (animation_paths.size() > 0) [[likely]] {
+			// TODO: More than one animation path
+			entity->render_update(start_time, animation_paths[0]);
+		}
+	}
+
+	return animated;
+}
+
+} // namespace openage::gamestate::system

libopenage/gamestate/system/property.h

@@ -0,0 +1,31 @@
+// Copyright 2024-2024 the openage authors. See copying.md for legal info.
+
+#pragma once
+
+#include <memory>
+
+#include <nyan/nyan.h>
+
+#include "time/time.h"
+
+
+namespace openage::gamestate {
+class GameEntity;
+
+namespace system {
+
+/**
+ * Handle the animated property of an ability.
+ *
+ * @param entity Game entity.
+ * @param ability Ability object.
+ * @param start_time Start time of the animation.
+ *
+ * @return true if the ability has the property, false otherwise.
+ */
+bool handle_animated(const std::shared_ptr<gamestate::GameEntity> &entity,
+                     const nyan::Object &ability,
+                     const time::time_t &start_time);
+
+} // namespace system
+} // namespace openage::gamestate