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

Handle the edge case of the party entering a boat which is on damaging terrain correctly.

Browse Source 
git-svn-id: http://openexile.googlecode.com/svn/trunk@75 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Niemand
2009-05-27 01:18:36 +00:00
parent b006efdc54
commit 5417fda4ca
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osx/boe.specials.cpp
View File

@@ -294,7 +294,8 @@ bool check_special_terrain(location where_check,short mode,short which_pc,short
can_enter = false;
break;
case TER_SPEC_DAMAGING:
if (flying() || univ.party.in_boat >= 0) //if the party is flying or in a boat, they cannot be harmed by terrain
//if the party is flying, in a boat, or entering a boat, they cannot be harmed by terrain
if (flying() || univ.party.in_boat >= 0 || (mode?town_boat_there(where_check):out_boat_there(where_check)) < 30)
break;
if(ter_flag3 > 0 && ter_flag3 < 8)
dam_type = (eDamageType) ter_flag3;
@@ -344,10 +345,9 @@ bool check_special_terrain(location where_check,short mode,short which_pc,short
fast_bang = 0;
LBL_NO_DAMAGE: break;
case TER_SPEC_DANGEROUS:
if (flying() || univ.party.in_boat >= 0) //if party is flying or in a boat, they cannot receive statuses from terrain
//if party is flying, in a boat, or entering a boat, they cannot receive statuses from terrain
if (flying() || univ.party.in_boat >= 0 || (mode?town_boat_there(where_check):out_boat_there(where_check)) < 30)
break;
if (univ.party.in_boat >= 0)
return true;
//one_sound(17);
if (mode == 2) i = which_pc; else i = 0;
for ( ; i < 6; i++)