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

Check for out-of-bound terrains when building roads

Browse Source 
Thanks to @fosnola for noticing this.
This commit is contained in:
Celtic Minstrel
2023-01-21 20:42:07 -05:00
parent 80b6a6decf
commit 17ad90ece1
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1187,6 +1187,7 @@ static bool can_build_roads_on(ter_num_t ter) {
}
static bool connect_roads(ter_num_t ter){
if(ter >= univ.scenario.ter_types.size()) return false;
eTrimType trim = univ.scenario.ter_types[ter].trim_type;
eTerSpec spec = univ.scenario.ter_types[ter].special;
if(trim == eTrimType::CITY)
@@ -1252,10 +1253,15 @@ void place_road(short q,short r,location where,bool here) {
ter_num_t ter = coord_to_ter(where.x, where.y);
ter_num_t ref = coord_to_ter(where.x,where.y);
bool horz = false, vert = false;
eTrimType trim = univ.scenario.ter_types[ref].trim_type;
eTrimType trim = eTrimType::NONE, vertTrim = eTrimType::NONE;
if(ref < univ.scenario.ter_types.size()) {
trim = univ.scenario.ter_types[ref].trim_type;
}
if(ter < univ.scenario.ter_types.size()) {
vertTrim = univ.scenario.ter_types[ter].trim_type;
}
if(where.y > 0)
ter = coord_to_ter(where.x,where.y - 1);
eTrimType vertTrim = univ.scenario.ter_types[ter].trim_type;
if((where.y == 0) || connect_roads(ter))
vert = can_build_roads_on(ref);
else if((vertTrim == eTrimType::S && trim == eTrimType::N) || (vertTrim == eTrimType::N && trim == eTrimType::S))

1
src/game/boe.locutils.cpp
View File

@@ -442,6 +442,7 @@ bool outd_is_special(location to_check) {
}
bool impassable(ter_num_t terrain_to_check) {
if(terrain_to_check >= univ.scenario.ter_types.size()) return true;
if(univ.scenario.ter_types[terrain_to_check].blocksMove())
return true;
else return false;