openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

ASAN: draw_terrain checks also bounds if outside...

Browse Source
This commit is contained in:
Laurent Alonso(fr)
2020-05-12 16:27:16 +02:00
committed by Celtic Minstrel
parent 6c904f3483
commit 6c89214505
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/boe.graphics.cpp
View File

@@ -729,6 +729,8 @@ void draw_terrain(short mode) {
if(is_combat())
view_loc = univ.party[(univ.cur_pc < 6) ? univ.cur_pc : first_active_pc()].combat_pos;
// ASAN: check also outside bound
short max_dim = is_out() ? 96 : univ.town->max_dim;
for(short i = 0; i < 13; i++)
for(short j = 0; j < 13; j++) {
where_draw = (is_out()) ? univ.party.out_loc : center;
@@ -736,8 +738,8 @@ void draw_terrain(short mode) {
where_draw.y += j - 6;
if(!(is_out()))
light_area[i][j] = (is_town()) ? pt_in_light(view_loc,where_draw) : combat_pt_in_light(where_draw);
if(!(is_out()) && ((where_draw.x < 0) || (where_draw.x > univ.town->max_dim - 1)
|| (where_draw.y < 0) || (where_draw.y > univ.town->max_dim - 1)))
if((where_draw.x < 0) || (where_draw.x > max_dim - 1)
|| (where_draw.y < 0) || (where_draw.y > max_dim - 1))
unexplored_area[i][j] = 0;
else unexplored_area[i][j] = 1 - is_explored(where_draw.x,where_draw.y);
}