diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-11-12 20:29:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-12 20:29:24 +0000 |
| commit | ac1a49725fc038ae11ef9060fecb2b0f9c6333b2 (patch) | |
| tree | c7341bd56c977259578b127886c9a88eeef11820 /scene/2d/tile_map.cpp | |
| parent | 5094c2a5f7d506b0e685120f14d1df42e1e9d495 (diff) | |
| parent | 3a73c6ebd18bff0fa125be58d3ac9c7a63bab61d (diff) | |
| download | redot-engine-ac1a49725fc038ae11ef9060fecb2b0f9c6333b2.tar.gz | |
Merge pull request #855 from Spartan322/merge/cb411fa
Merge commit godotengine/godot@cb411fa
Diffstat (limited to 'scene/2d/tile_map.cpp')
| -rw-r--r-- | scene/2d/tile_map.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index cb66cfe3b5..9e0973b239 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -77,7 +77,8 @@ void TileMap::_set_tile_map_data_using_compatibility_format(int p_layer, TileMap for (int i = 0; i < c; i += offset) { const uint8_t *ptr = (const uint8_t *)&r[i]; uint8_t local[12]; - for (int j = 0; j < ((p_format >= TileMapDataFormat::TILE_MAP_DATA_FORMAT_2) ? 12 : 8); j++) { + const int buffer_size = (format == TILE_MAP_DATA_FORMAT_2) ? 12 : 8; + for (int j = 0; j < buffer_size; j++) { local[j] = ptr[j]; } |