Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Change return type of get_configuration_warnings to PackedStringArray

Browse source
This commit is contained in:
Marc Gilleron 2022-09-19 16:43:15 +01:00
parent 908795301b
commit aed3822a93
126 changed files with 201 additions and 203 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
TypedArray<String> MultiplayerSpawner::get_configuration_warnings() const {
TypedArray<String> 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:
TypedArray<String> 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

@ -94,8 +94,8 @@ void MultiplayerSynchronizer::_update_process() {
}
}
TypedArray<String> MultiplayerSynchronizer::get_configuration_warnings() const {
TypedArray<String> 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

@ -66,7 +66,7 @@ public:
static Error get_state(const List<NodePath> &p_properties, Object *p_obj, Vector<Variant> &r_variant, Vector<const Variant *> &r_variant_ptrs);
static Error set_state(const List<NodePath> &p_properties, Object *p_obj, const Vector<Variant> &p_state);
TypedArray<String> get_configuration_warnings() const override;
PackedStringArray get_configuration_warnings() const override;
void set_replication_interval(double p_interval);
double get_replication_interval() const;