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

Fix items that cause a status effect or cast a spell

Browse Source
This commit is contained in:
Celtic Minstrel
2019-12-29 14:11:19 -05:00
parent 7233a8ba78
commit 5ca27fdad5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -548,9 +548,7 @@ void use_item(short pc,short item) {
short level,str,r1; short level,str,r1;
short sp[3] = {}; // Dummy values to pass to run_special; not actually used short sp[3] = {}; // Dummy values to pass to run_special; not actually used
std::string str1, str2; // Used by books std::string str1, str2; // Used by books
eStatus status;
eItemUse type; eItemUse type;
eSpell spell;
location user_loc; location user_loc;
const cItem& item_rec = univ.party[pc].items[item]; const cItem& item_rec = univ.party[pc].items[item];
eItemAbil abil = item_rec.ability; eItemAbil abil = item_rec.ability;
@@ -610,7 +608,8 @@ void use_item(short pc,short item) {
case eItemAbil::POISON_WEAPON: // poison weapon case eItemAbil::POISON_WEAPON: // poison weapon
take_charge = poison_weapon(pc,str,false); take_charge = poison_weapon(pc,str,false);
break; break;
case eItemAbil::AFFECT_STATUS: case eItemAbil::AFFECT_STATUS: {
auto status = eStatus(univ.party[pc].items[item].abil_data[1]);
switch(status) { switch(status) {
case eStatus::MAIN: case eStatus::CHARM: case eStatus::MAIN: case eStatus::CHARM:
// These don't make any sense in this context. // These don't make any sense in this context.
@@ -842,7 +841,7 @@ void use_item(short pc,short item) {
} }
break; break;
} }
break; } break;
case eItemAbil::BLISS_DOOM: case eItemAbil::BLISS_DOOM:
switch(type) { switch(type) {
case eItemUse::HELP_ONE: case eItemUse::HELP_ONE:
@@ -1044,12 +1043,13 @@ void use_item(short pc,short item) {
take_charge = false; take_charge = false;
break; break;
case eItemAbil::CAST_SPELL: case eItemAbil::CAST_SPELL: {
if(univ.town.is_antimagic(user_loc.x, user_loc.y)) { if(univ.town.is_antimagic(user_loc.x, user_loc.y)) {
add_string_to_buf(" Not in antimagic field."); add_string_to_buf(" Not in antimagic field.");
take_charge = false; take_charge = false;
break; break;
} }
auto spell = eSpell(univ.party[pc].items[item].abil_data[1]);
switch(spell) { switch(spell) {
case eSpell::FLAME: add_string_to_buf(" It fires a bolt of flame."); break; case eSpell::FLAME: add_string_to_buf(" It fires a bolt of flame."); break;
case eSpell::FIREBALL: add_string_to_buf(" It shoots a fireball."); break; case eSpell::FIREBALL: add_string_to_buf(" It shoots a fireball."); break;
@@ -1095,7 +1095,7 @@ void use_item(short pc,short item) {
} else if((*spell).is_priest()) } else if((*spell).is_priest())
do_priest_spell(univ.cur_pc, spell, true); do_priest_spell(univ.cur_pc, spell, true);
else do_mage_spell(univ.cur_pc, spell, true); else do_mage_spell(univ.cur_pc, spell, true);
break; } break;
case eItemAbil::SUMMONING: case eItemAbil::SUMMONING:
if(!summon_monster(univ.party[pc].items[item].abil_data[1],user_loc,str,eAttitude::FRIENDLY,true)) if(!summon_monster(univ.party[pc].items[item].abil_data[1],user_loc,str,eAttitude::FRIENDLY,true))
add_string_to_buf(" Summon failed."); add_string_to_buf(" Summon failed.");