godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49555 from timothyqiu/tileset-range 

Add range check for TileSet::CellNeighbor parameter
This commit is contained in:
Rémi Verschelde 2021-06-13 10:44:04 +02:00 committed by GitHub
parent 1003054134 43f9253c53
commit 2ed9bb7e42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/tile_set.cpp
View File

@ -2454,6 +2454,7 @@ int TileData::get_terrain_set() const {
} }
void TileData::set_peering_bit_terrain(TileSet::CellNeighbor p_peering_bit, int p_terrain_index) { void TileData::set_peering_bit_terrain(TileSet::CellNeighbor p_peering_bit, int p_terrain_index) {
ERR_FAIL_INDEX(p_peering_bit, TileSet::CELL_NEIGHBOR_MAX);
ERR_FAIL_COND(p_terrain_index < -1); ERR_FAIL_COND(p_terrain_index < -1);
if (tile_set) { if (tile_set) {
ERR_FAIL_COND(p_terrain_index >= tile_set->get_terrains_count(terrain_set)); ERR_FAIL_COND(p_terrain_index >= tile_set->get_terrains_count(terrain_set));
@ -2464,6 +2465,7 @@ void TileData::set_peering_bit_terrain(TileSet::CellNeighbor p_peering_bit, int
} }
int TileData::get_peering_bit_terrain(TileSet::CellNeighbor p_peering_bit) const { int TileData::get_peering_bit_terrain(TileSet::CellNeighbor p_peering_bit) const {
ERR_FAIL_INDEX_V(p_peering_bit, TileSet::CELL_NEIGHBOR_MAX, -1);
return terrain_peering_bits[p_peering_bit]; return terrain_peering_bits[p_peering_bit];
} }