diff options
| author | Rémi Verschelde | 2018-01-12 09:00:20 +0100 |
|---|---|---|
| committer | GitHub | 2018-01-12 09:00:20 +0100 |
| commit | e24f2c6489afdccc6268008d3dcc1ff4ad8ea71c (patch) | |
| tree | ee8faddef95f8bcb66acfce729a6f85513740b2d /scene/2d/tile_map.cpp | |
| parent | 00630479dd5e5aa95915fddf7df9c6b11f525b0e (diff) | |
| parent | ad79c703008394a360eb9875196a9414e1c84585 (diff) | |
| download | godot-e24f2c6489afdccc6268008d3dcc1ff4ad8ea71c.tar.gz godot-e24f2c6489afdccc6268008d3dcc1ff4ad8ea71c.tar.zst godot-e24f2c6489afdccc6268008d3dcc1ff4ad8ea71c.zip | |
Merge pull request #15611 from bojidar-bg/x-bind-more-properties
Bind many more properties to scripts
Diffstat (limited to '')
| -rw-r--r-- | scene/2d/tile_map.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 5367e42aa..361d765c9 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -999,8 +999,8 @@ void TileMap::_set_tile_data(const PoolVector<int> &p_data) { bool flip_v = v & (1 << 30); bool transpose = v & (1 << 31); v &= (1 << 29) - 1; - int16_t coord_x; - int16_t coord_y; + int16_t coord_x = 0; + int16_t coord_y = 0; if (format == FORMAT_2) { coord_x = decode_uint16(&local[8]); coord_y = decode_uint16(&local[10]); @@ -1312,10 +1312,10 @@ bool TileMap::_get(const StringName &p_name, Variant &r_ret) const { void TileMap::_get_property_list(List<PropertyInfo> *p_list) const { - PropertyInfo p(Variant::INT, "format", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR); + PropertyInfo p(Variant::INT, "format", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL); p_list->push_back(p); - p = PropertyInfo(Variant::OBJECT, "tile_data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR); + p = PropertyInfo(Variant::OBJECT, "tile_data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL); p_list->push_back(p); } |