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

Merge branch 'master' of https://github.com/calref/cboe

Browse Source
This commit is contained in:
Ben Scott
2015-02-12 01:48:29 -05:00
parent 1477fef7ce 7e85e0dda2
commit 032dc7b1ba
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/boe.specials.cpp
View File

@@ -1955,6 +1955,7 @@ void run_special(eSpecCtx which_mode,short which_type,short start_spec,location
case eSpecCtx::TALK: case eSpecCtx::USE_SPEC_ITEM: case eSpecCtx::TOWN_HOSTILE:
case eSpecCtx::TOWN_TIMER: case eSpecCtx::SCEN_TIMER: case eSpecCtx::PARTY_TIMER:
case eSpecCtx::OUTDOOR_ENC: case eSpecCtx::FLEE_ENCOUNTER: case eSpecCtx::WIN_ENCOUNTER:
case eSpecCtx::DROP_ITEM: case eSpecCtx::SHOPPING:
// Default behaviour - select entire party, or active member if split or in combat
if(is_combat()) current_pc_picked_in_spec_enc = &univ.party[current_pc];
else {
@@ -1971,7 +1972,7 @@ void run_special(eSpecCtx which_mode,short which_type,short start_spec,location
if(!current_pc_picked_in_spec_enc)
current_pc_picked_in_spec_enc = &univ.party;
break;
case eSpecCtx::TARGET: case eSpecCtx::USE_SPACE:
case eSpecCtx::TARGET: case eSpecCtx::USE_SPACE: case eSpecCtx::HAIL:
// If there's a monster on the space, select that as the target
current_pc_picked_in_spec_enc = univ.target_there(spec_loc, TARG_MONST);
if(!current_pc_picked_in_spec_enc)