mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 21:49:41 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'mikesc/bug1482'

Browse source
This commit is contained in:
Marc Zinnschlag 2014-07-22 08:13:35 +02:00
commit 91afc2ebe7
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwworld/worldimp.cpp
View file

@ -2316,16 +2316,11 @@ namespace MWWorld
} }
// If this is a power, check if it was already used in the last 24h // If this is a power, check if it was already used in the last 24h
if (!fail && spell->mData.mType == ESM::Spell::ST_Power) if (!fail && spell->mData.mType == ESM::Spell::ST_Power && !stats.getSpells().canUsePower(spell->mId))
{
if (stats.getSpells().canUsePower(spell->mId))
stats.getSpells().usePower(spell->mId);
else
{ {
message = "#{sPowerAlreadyUsed}"; message = "#{sPowerAlreadyUsed}";
fail = true; fail = true;
} }
}
// Reduce mana // Reduce mana
if (!fail) if (!fail)
@ -2358,6 +2353,10 @@ namespace MWWorld
{ {
const ESM::Spell* spell = getStore().get<ESM::Spell>().search(selectedSpell); const ESM::Spell* spell = getStore().get<ESM::Spell>().search(selectedSpell);
// A power can be used once per 24h
if (spell->mData.mType == ESM::Spell::ST_Power)
stats.getSpells().usePower(spell->mId);
cast.cast(spell); cast.cast(spell);
} }
else if (actor.getClass().hasInventoryStore(actor)) else if (actor.getClass().hasInventoryStore(actor))