noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Revert "Update Node::get_configuration_warnings signature"

Browse Source 
This reverts commit d3852deaa4.
This commit is contained in:
Rémi Verschelde
2024-02-17 19:03:21 +01:00
parent 9f76398781
commit 21f0529aa9
132 changed files with 213 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/multiplayer/multiplayer_spawner.cpp
View File

@@ -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."));

2
modules/multiplayer/multiplayer_spawner.h
View File

@@ -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;

4
modules/multiplayer/multiplayer_synchronizer.cpp
View File

@@ -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."));

2
modules/multiplayer/multiplayer_synchronizer.h
View File

@@ -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;