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

Check for horse-blocking terrains outdoors

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-11 01:46:02 -05:00
parent 652e5ebf98
commit 3e31a91214
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osx/boe.actions.cpp
View File

@@ -2778,6 +2778,7 @@ bool outd_move_party(location destination,bool forced)
&& (scenario.ter_types[ter].boat_over == true) && (scenario.ter_types[ter].boat_over == true)
&& scenario.ter_types[ter].special != eTerSpec::TOWN_ENTRANCE) { && scenario.ter_types[ter].special != eTerSpec::TOWN_ENTRANCE) {
// TODO: It kinda looks like there should be a check for eTerSpec::BRIDGE here? // TODO: It kinda looks like there should be a check for eTerSpec::BRIDGE here?
// Note: Maybe not though, since this is where boating over lava was once hard-coded...?
if(cChoiceDlog("boat-bridge.xml",{"under","land"}).show() == "under") if(cChoiceDlog("boat-bridge.xml",{"under","land"}).show() == "under")
forced = true; forced = true;
else { else {
@@ -2837,11 +2838,15 @@ bool outd_move_party(location destination,bool forced)
// Check if can fly over // Check if can fly over
|| ((flying() == true) && || ((flying() == true) &&
(scenario.ter_types[ter].fly_over == true)) ) { (scenario.ter_types[ter].fly_over == true)) ) {
if(scenario.ter_types[ter].special == eTerSpec::DAMAGING || scenario.ter_types[ter].special == eTerSpec::DANGEROUS) {
if(univ.party.in_horse >= 0) { if(univ.party.in_horse >= 0) {
if(scenario.ter_types[ter].special == eTerSpec::DAMAGING || scenario.ter_types[ter].special == eTerSpec::DANGEROUS) {
ASB("Your horses quite sensibly refuse."); ASB("Your horses quite sensibly refuse.");
return false; return false;
} }
if(scenario.ter_types[ter].block_horse) {
ASB("You can't take horses there!");
return false;
}
} }
univ.party.direction = set_direction(univ.party.p_loc, destination); univ.party.direction = set_direction(univ.party.p_loc, destination);