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

fix OUT_FORCE_TOWN nodes

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-05-12 13:19:04 -05:00
parent 8e32c588ff
commit 3677f4c369
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/game/boe.specials.cpp
View File

@@ -4547,9 +4547,16 @@ void outdoor_spec(const runtime_state& ctx){
*ctx.ret_a = 1;
break;
case eSpecType::OUT_FORCE_TOWN: {
short town = spec.ex1a;
if(town < 0 || town >= univ.scenario.towns.size()){
showError("The scenario attempted to put the party in a nonexistent town: " + std::to_string(town));
break;
}
size_t town_dim = univ.scenario.towns[town]->max_dim;
l = {spec.ex2a, spec.ex2b};
// town entry direction. 9 means forced position
int i = 0;
if(l.x < 0 || l.y < 0 || l.x >= 64 || l.y >= 64)
if(l.x >= 0 && l.y >= 0 && l.x < town_dim && l.y < town_dim)
i = 9;
else if(spec.ex1b == 0) i = 2;
else if(spec.ex1b == 4) i = 0;