diff options
| author | Andrew Thomas <andrewjamest1993@protonmail.com> | 2017-12-09 10:44:26 -0600 |
|---|---|---|
| committer | Andrew Thomas <andrewjamest1993@protonmail.com> | 2017-12-09 10:44:26 -0600 |
| commit | c3a005011b9c721a303ecb0f9783aae8b6fa17e3 (patch) | |
| tree | 69ba2baafad22405368179d4b5a4c629d881843c /scene/2d/tile_map.h | |
| parent | 5938466c848becb269f002191901487135e39ce3 (diff) | |
Convert tilemap format in get_tile_data()
Diffstat (limited to 'scene/2d/tile_map.h')
| -rw-r--r-- | scene/2d/tile_map.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/2d/tile_map.h b/scene/2d/tile_map.h index 8eecf48df2..9698024bcd 100644 --- a/scene/2d/tile_map.h +++ b/scene/2d/tile_map.h @@ -61,8 +61,8 @@ public: private: enum DataFormat { - FORMAT_2_1_4 = 0, - FORMAT_2_1_5 + FORMAT_1 = 0, + FORMAT_2 }; Ref<TileSet> tile_set; @@ -178,7 +178,7 @@ private: float bounce; uint32_t collision_layer; uint32_t collision_mask; - DataFormat format; + mutable DataFormat format; TileOrigin tile_origin; |