teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #1094 from Allofich/alchemy

Browse source 
Fix reversed use of alembics and retorts
This commit is contained in:
scrawl 2016-10-06 19:02:24 +02:00 committed by GitHub
commit 37bfa88b2d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwmechanics/alchemy.cpp
View file

@ -73,7 +73,7 @@ void MWMechanics::Alchemy::applyTools (int flags, float& value) const
bool duration = !(flags & ESM::MagicEffect::NoDuration);
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;

2
components/esm/loadappa.hpp
View file

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