From 2a8c59c171e609d739dcc59d15e3e205dbf47cde Mon Sep 17 00:00:00 2001 From: Nathan Franke Date: Thu, 29 Oct 2020 05:01:28 -0500 Subject: Use Array for node configuration warnings Previously, the warnings were passed as a string and delimitation of which were hard coded at each implementation. --- scene/2d/remote_transform_2d.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'scene/2d/remote_transform_2d.cpp') diff --git a/scene/2d/remote_transform_2d.cpp b/scene/2d/remote_transform_2d.cpp index f10714e28a..a7613dc009 100644 --- a/scene/2d/remote_transform_2d.cpp +++ b/scene/2d/remote_transform_2d.cpp @@ -138,7 +138,7 @@ void RemoteTransform2D::set_remote_node(const NodePath &p_remote_node) { _update_remote(); } - update_configuration_warning(); + update_configuration_warnings(); } NodePath RemoteTransform2D::get_remote_node() const { @@ -185,17 +185,14 @@ void RemoteTransform2D::force_update_cache() { _update_cache(); } -String RemoteTransform2D::get_configuration_warning() const { - String warning = Node2D::get_configuration_warning(); +TypedArray RemoteTransform2D::get_configuration_warnings() const { + TypedArray warnings = Node::get_configuration_warnings(); if (!has_node(remote_node) || !Object::cast_to(get_node(remote_node))) { - if (!warning.is_empty()) { - warning += "\n\n"; - } - warning += TTR("Path property must point to a valid Node2D node to work."); + warnings.push_back(TTR("Path property must point to a valid Node2D node to work.")); } - return warning; + return warnings; } void RemoteTransform2D::_bind_methods() { -- cgit v1.2.3