diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-17 19:03:21 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-17 19:03:21 +0100 |
| commit | 21f0529aa923e8d337827074f15a5cf83f73c19a (patch) | |
| tree | 582cdfc9017dd5e655808747394f2008dc481ede /modules/multiplayer | |
| parent | 9f76398781fbb7c92c5d25ff0df236f91f3d4b10 (diff) | |
| download | redot-engine-21f0529aa923e8d337827074f15a5cf83f73c19a.tar.gz | |
Revert "Update Node::get_configuration_warnings signature"
This reverts commit d3852deaa450d77edb30df2bb1c77bd7bc45befc.
Diffstat (limited to 'modules/multiplayer')
| -rw-r--r-- | modules/multiplayer/multiplayer_spawner.cpp | 4 | ||||
| -rw-r--r-- | modules/multiplayer/multiplayer_spawner.h | 2 | ||||
| -rw-r--r-- | modules/multiplayer/multiplayer_synchronizer.cpp | 4 | ||||
| -rw-r--r-- | modules/multiplayer/multiplayer_synchronizer.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/modules/multiplayer/multiplayer_spawner.cpp b/modules/multiplayer/multiplayer_spawner.cpp index fecefc7e71..264a2e9c8e 100644 --- a/modules/multiplayer/multiplayer_spawner.cpp +++ b/modules/multiplayer/multiplayer_spawner.cpp @@ -87,8 +87,8 @@ void MultiplayerSpawner::_get_property_list(List<PropertyInfo> *p_list) const { } #endif -Array MultiplayerSpawner::get_configuration_warnings() const { - Array 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 6cd2946df7..0e94b781ea 100644 --- a/modules/multiplayer/multiplayer_spawner.h +++ b/modules/multiplayer/multiplayer_spawner.h @@ -91,7 +91,7 @@ protected: void _get_property_list(List<PropertyInfo> *p_list) const; #endif public: - Array get_configuration_warnings() const override; + PackedStringArray get_configuration_warnings() const override; Node *get_spawn_node() const { return spawn_node.is_valid() ? Object::cast_to<Node>(ObjectDB::get_instance(spawn_node)) : nullptr; diff --git a/modules/multiplayer/multiplayer_synchronizer.cpp b/modules/multiplayer/multiplayer_synchronizer.cpp index 16df9da78e..02e3a11964 100644 --- a/modules/multiplayer/multiplayer_synchronizer.cpp +++ b/modules/multiplayer/multiplayer_synchronizer.cpp @@ -143,8 +143,8 @@ bool MultiplayerSynchronizer::update_inbound_sync_time(uint16_t p_network_time) return true; } -Array MultiplayerSynchronizer::get_configuration_warnings() const { - Array 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 f5f3993f0d..192d7a5920 100644 --- a/modules/multiplayer/multiplayer_synchronizer.h +++ b/modules/multiplayer/multiplayer_synchronizer.h @@ -91,7 +91,7 @@ public: bool update_outbound_sync_time(uint64_t p_usec); bool update_inbound_sync_time(uint16_t p_network_time); - Array get_configuration_warnings() const override; + PackedStringArray get_configuration_warnings() const override; void set_replication_interval(double p_interval); double get_replication_interval() const; |
