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

special.cpp: retrieve correctly allow/deny enter in legacy scenario,

Browse Source 
universe.cpp: correct a memory problem...
This commit is contained in:
Laurent alonso
2020-10-30 14:30:14 +01:00
committed by Celtic Minstrel
parent 303674da10
commit 1bf43ee01e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scenario/special.cpp
View File

@@ -316,7 +316,7 @@ void cSpecial::import_legacy(legacy::special_node_type& old){
break;
case 11: // Can't enter
type = eSpecType::CANT_ENTER;
ex1a = 1;
ex1a = ex1a==0 ? 0 : 1;
ex2a = 0;
break;
case 26: // Wandering will fight

4
src/universe/universe.cpp
View File

@@ -901,6 +901,10 @@ bool cCurOut::is_road(int x, int y) {
if(y >= 48) sector_y++, y -= 48;
sector_x += univ.party.outdoor_corner.x;
sector_y += univ.party.outdoor_corner.y;
// ASAN can happens if a hole allows to goes out the scenario...
if (sector_x<0 || sector_x>=univ.scenario.outdoors.width() ||
sector_y<0 || sector_y>=univ.scenario.outdoors.height())
return false;
return univ.scenario.outdoors[sector_x][sector_y]->roads[x][y];
}