Merge pull request #1094 from Allofich/alchemy

Fix reversed use of alembics and retorts
coverity_scan^2
scrawl 8 years ago committed by GitHub
commit 37bfa88b2d

@ -73,7 +73,7 @@ void MWMechanics::Alchemy::applyTools (int flags, float& value) const
bool duration = !(flags & ESM::MagicEffect::NoDuration); bool duration = !(flags & ESM::MagicEffect::NoDuration);
bool negative = (flags & ESM::MagicEffect::Harmful) != 0; bool negative = (flags & ESM::MagicEffect::Harmful) != 0;
int tool = negative ? ESM::Apparatus::Retort : ESM::Apparatus::Albemic; int tool = negative ? ESM::Apparatus::Alembic : ESM::Apparatus::Retort;
int setup = 0; int setup = 0;

@ -22,7 +22,7 @@ struct Apparatus
enum AppaType enum AppaType
{ {
MortarPestle = 0, MortarPestle = 0,
Albemic = 1, Alembic = 1,
Calcinator = 2, Calcinator = 2,
Retort = 3 Retort = 3
}; };

Loading…
Cancel
Save