From aed3822a93a54e285bfb711ff91b4cb86ea94841 Mon Sep 17 00:00:00 2001 From: Marc Gilleron Date: Mon, 19 Sep 2022 16:43:15 +0100 Subject: Change return type of `get_configuration_warnings` to `PackedStringArray` --- modules/multiplayer/multiplayer_spawner.cpp | 4 ++-- modules/multiplayer/multiplayer_spawner.h | 2 +- modules/multiplayer/multiplayer_synchronizer.cpp | 4 ++-- modules/multiplayer/multiplayer_synchronizer.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'modules/multiplayer') diff --git a/modules/multiplayer/multiplayer_spawner.cpp b/modules/multiplayer/multiplayer_spawner.cpp index c68e2e5a99..9d28feef09 100644 --- a/modules/multiplayer/multiplayer_spawner.cpp +++ b/modules/multiplayer/multiplayer_spawner.cpp @@ -87,8 +87,8 @@ void MultiplayerSpawner::_get_property_list(List *p_list) const { } #endif -TypedArray MultiplayerSpawner::get_configuration_warnings() const { - TypedArray warnings = Node::get_configuration_warnings(); +PackedStringArray MultiplayerSpawner::get_configuration_warnings() const { + PackedStringArray warnings = Node::get_configuration_warnings(); if (spawn_path.is_empty() || !has_node(spawn_path)) { warnings.push_back(RTR("A valid NodePath must be set in the \"Spawn Path\" property in order for MultiplayerSpawner to be able to spawn Nodes.")); diff --git a/modules/multiplayer/multiplayer_spawner.h b/modules/multiplayer/multiplayer_spawner.h index f038c3b2f9..587c99efd1 100644 --- a/modules/multiplayer/multiplayer_spawner.h +++ b/modules/multiplayer/multiplayer_spawner.h @@ -91,7 +91,7 @@ protected: void _get_property_list(List *p_list) const; #endif public: - TypedArray get_configuration_warnings() const override; + PackedStringArray get_configuration_warnings() const override; Node *get_spawn_node() const { return spawn_node.is_valid() ? Object::cast_to(ObjectDB::get_instance(spawn_node)) : nullptr; diff --git a/modules/multiplayer/multiplayer_synchronizer.cpp b/modules/multiplayer/multiplayer_synchronizer.cpp index 01ecd1a7de..2c3ebccaeb 100644 --- a/modules/multiplayer/multiplayer_synchronizer.cpp +++ b/modules/multiplayer/multiplayer_synchronizer.cpp @@ -94,8 +94,8 @@ void MultiplayerSynchronizer::_update_process() { } } -TypedArray MultiplayerSynchronizer::get_configuration_warnings() const { - TypedArray warnings = Node::get_configuration_warnings(); +PackedStringArray MultiplayerSynchronizer::get_configuration_warnings() const { + PackedStringArray warnings = Node::get_configuration_warnings(); if (root_path.is_empty() || !has_node(root_path)) { warnings.push_back(RTR("A valid NodePath must be set in the \"Root Path\" property in order for MultiplayerSynchronizer to be able to synchronize properties.")); diff --git a/modules/multiplayer/multiplayer_synchronizer.h b/modules/multiplayer/multiplayer_synchronizer.h index 9b9067a910..f10a95a1d4 100644 --- a/modules/multiplayer/multiplayer_synchronizer.h +++ b/modules/multiplayer/multiplayer_synchronizer.h @@ -66,7 +66,7 @@ public: static Error get_state(const List &p_properties, Object *p_obj, Vector &r_variant, Vector &r_variant_ptrs); static Error set_state(const List &p_properties, Object *p_obj, const Vector &p_state); - TypedArray get_configuration_warnings() const override; + PackedStringArray get_configuration_warnings() const override; void set_replication_interval(double p_interval); double get_replication_interval() const; -- cgit v1.2.3