summaryrefslogtreecommitdiff
path: root/scene/2d
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-08 17:35:11 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-08 17:41:32 -0300
commit1b0930c435b3aa4a3ab41b4936b9ceaa2f1da775 (patch)
tree9f1449d05875528d075f723520905883121d9337 /scene/2d
parent8b7a86ec7b7bc4bb115f45545aa062cba47022bc (diff)
Renamed finished to animation_finished, also passes the animation name when finished
Diffstat (limited to 'scene/2d')
-rw-r--r--scene/2d/animated_sprite.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp
index f9f6525686..97c23f3a46 100644
--- a/scene/2d/animated_sprite.cpp
+++ b/scene/2d/animated_sprite.cpp
@@ -363,7 +363,7 @@ void AnimatedSprite::_notification(int p_what) {
} else {
frame++;
if (frame==fc-1) {
- emit_signal(SceneStringNames::get_singleton()->finished);
+ emit_signal(SceneStringNames::get_singleton()->animation_finished);
}
}
@@ -685,7 +685,7 @@ void AnimatedSprite::_bind_methods() {
ClassDB::bind_method(_MD("_res_changed"),&AnimatedSprite::_res_changed);
ADD_SIGNAL(MethodInfo("frame_changed"));
- ADD_SIGNAL(MethodInfo("finished"));
+ ADD_SIGNAL(MethodInfo("animation_finished"));
ADD_PROPERTYNZ( PropertyInfo( Variant::OBJECT, "frames",PROPERTY_HINT_RESOURCE_TYPE,"SpriteFrames"), _SCS("set_sprite_frames"),_SCS("get_sprite_frames"));
ADD_PROPERTY( PropertyInfo( Variant::STRING, "animation"), _SCS("set_animation"),_SCS("get_animation"));