diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-05-24 17:57:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-24 17:57:16 +0200 |
commit | 5061e5620e2444e27328636a3f6f1743ad225b4b (patch) | |
tree | e18b26fb28983fb012f2ab1a776dfc3cb48b9448 | |
parent | 116d20fbf295db7925d3743cc25064dd11938766 (diff) | |
parent | f4e8c68e00b6de8f49b9d86513b451d5152186c5 (diff) |
Merge pull request #49033 from groud/fix_deprecated_no
Fixes deprecated=no compilation option
-rw-r--r-- | scene/2d/tile_map.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 188f8d300d..8666361e88 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -777,6 +777,11 @@ void TileMap::_set_tile_data(const Vector<int> &p_data) { int offset = (format >= FORMAT_2) ? 3 : 2; clear(); + +#ifdef DISABLE_DEPRECATED + ERR_FAIL_COND_MSG(format != FORMAT_3, vformat("Cannot handle deprecated TileMap data format version %d. This Godot version was compiled with no support for deprecated data.", format)); +#endif + for (int i = 0; i < c; i += offset) { const uint8_t *ptr = (const uint8_t *)&r[i]; uint8_t local[12]; @@ -806,6 +811,7 @@ void TileMap::_set_tile_data(const Vector<int> &p_data) { uint16_t alternative_tile = decode_uint16(&local[10]); set_cell(Vector2i(x, y), source_id, Vector2i(atlas_coords_x, atlas_coords_y), alternative_tile); } else { +#ifndef DISABLE_DEPRECATED uint32_t v = decode_uint32(&local[4]); v &= (1 << 29) - 1; @@ -828,6 +834,7 @@ void TileMap::_set_tile_data(const Vector<int> &p_data) { } set_cell(Vector2i(x, y), v, Vector2i(coord_x, coord_y), compatibility_alternative_tile); +#endif } } } |