libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HDB: Add NULL checking to getMapBG/FGTileFlags()

Browse Source
This commit is contained in:
Nipun Garg 2019-06-22 22:22:28 +05:30 committed by Eugene Sandulenko
parent 776b257e52
commit ef7eaa9257
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/hdb/map-loader.cpp
View File

@ -691,14 +691,20 @@ uint32 Map::getMapBGTileFlags(int x, int y) {
if (x < 0 || x >= _width || y < 0 || y >= _height) {
return 0;
}
return g_hdb->_drawMan->getTile(_background[y * _width + x])->_flags;
Tile* tile = g_hdb->_drawMan->getTile(_foreground[y * _width + x]);
if (tile)
return tile->_flags;
return 0;
}
uint32 Map::getMapFGTileFlags(int x, int y) {
if (x < 0 || x >= _width || y < 0 || y >= _height) {
return 0;
}
return g_hdb->_drawMan->getTile(_foreground[y * _width + x])->_flags;
Tile* tile = g_hdb->_drawMan->getTile(_foreground[y * _width + x]);
if (tile)
return tile->_flags;
return 0;
}
uint16 Map::getMapBGTileIndex(int x, int y) {