diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-20 21:31:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-20 21:31:12 +0100 |
| commit | 083d088de3fe7cd5d825cebebc46ce32fc87b4b0 (patch) | |
| tree | 9b2524105bf989f6ac0ad1c488ac493f558a391f /scene/2d/tile_map.cpp | |
| parent | 719254ae0d4e1b7c9be36a4399809caf270d7e86 (diff) | |
| parent | 99d8626f4a313471410db421891e90fe768cd929 (diff) | |
Merge pull request #33583 from qarmin/fix_overflows_unitialized
Fix some overflows and unitialized variables
Diffstat (limited to 'scene/2d/tile_map.cpp')
| -rw-r--r-- | scene/2d/tile_map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 173214dfe4..d75d8cfc55 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -1233,8 +1233,8 @@ void TileMap::_set_tile_data(const PoolVector<int> &p_data) { } #endif - int16_t x = decode_uint16(&local[0]); - int16_t y = decode_uint16(&local[2]); + uint16_t x = decode_uint16(&local[0]); + uint16_t y = decode_uint16(&local[2]); uint32_t v = decode_uint32(&local[4]); bool flip_h = v & (1 << 29); bool flip_v = v & (1 << 30); |