Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-16 15:50:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #85463 from akien-mga/tilemap-fix-cell_quadrant_size-compat

Browse Source 
TileMap: Fix compatibility code for old `cell_quadrant_size` property name
This commit is contained in:
Rémi Verschelde 2023-11-28 13:37:32 +01:00
commit a0d7649192
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scene/2d/tile_map.cpp
View File

@ -3623,8 +3623,9 @@ bool TileMap::_set(const StringName &p_name, const Variant &p_value) {
format = (TileMapLayer::DataFormat)(p_value.operator int64_t()); // Set format used for loading. format = (TileMapLayer::DataFormat)(p_value.operator int64_t()); // Set format used for loading.
return true; return true;
} }
}
#ifndef DISABLE_DEPRECATED #ifndef DISABLE_DEPRECATED
} else if (p_name == "tile_data") { // Kept for compatibility reasons. else if (p_name == "tile_data") { // Kept for compatibility reasons.
if (p_value.is_array()) { if (p_value.is_array()) {
if (layers.size() == 0) { if (layers.size() == 0) {
Ref<TileMapLayer> new_layer; Ref<TileMapLayer> new_layer;
@ -3638,10 +3639,12 @@ bool TileMap::_set(const StringName &p_name, const Variant &p_value) {
return true; return true;
} }
return false; return false;
} else if (p_name == "rendering_quadrant_size") { } else if (p_name == "cell_quadrant_size") {
set_rendering_quadrant_size(p_value); set_rendering_quadrant_size(p_value);
return true;
}
#endif // DISABLE_DEPRECATED #endif // DISABLE_DEPRECATED
} else if (components.size() == 2 && components[0].begins_with("layer_") && components[0].trim_prefix("layer_").is_valid_int()) { else if (components.size() == 2 && components[0].begins_with("layer_") && components[0].trim_prefix("layer_").is_valid_int()) {
int index = components[0].trim_prefix("layer_").to_int(); int index = components[0].trim_prefix("layer_").to_int();
if (index < 0) { if (index < 0) {
return false; return false;
@ -3698,7 +3701,14 @@ bool TileMap::_get(const StringName &p_name, Variant &r_ret) const {
if (p_name == "format") { if (p_name == "format") {
r_ret = TileMapLayer::FORMAT_MAX - 1; // When saving, always save highest format. r_ret = TileMapLayer::FORMAT_MAX - 1; // When saving, always save highest format.
return true; return true;
} else if (components.size() == 2 && components[0].begins_with("layer_") && components[0].trim_prefix("layer_").is_valid_int()) { }
#ifndef DISABLE_DEPRECATED
else if (p_name == "cell_quadrant_size") { // Kept for compatibility reasons.
r_ret = get_rendering_quadrant_size();
return true;
}
#endif
else if (components.size() == 2 && components[0].begins_with("layer_") && components[0].trim_prefix("layer_").is_valid_int()) {
int index = components[0].trim_prefix("layer_").to_int(); int index = components[0].trim_prefix("layer_").to_int();
if (index < 0 || index >= (int)layers.size()) { if (index < 0 || index >= (int)layers.size()) {
return false; return false;