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

Fix duplicate code

Browse source
This commit is contained in:
scrawl 2017-09-25 17:47:30 +02:00
parent e4c9d84666
commit 82a211ba03
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View file

@ -365,19 +365,7 @@ namespace MWDialogue
} }
// check the available services of this actor // check the available services of this actor
int services = 0; int services = mActor.getClass().getServices(mActor);
if (mActor.getTypeName() == typeid(ESM::NPC).name())
{
MWWorld::LiveCellRef<ESM::NPC>* ref = mActor.get<ESM::NPC>();
if (ref->mBase->mHasAI)
services = ref->mBase->mAiData.mServices;
}
else if (mActor.getTypeName() == typeid(ESM::Creature).name())
{
MWWorld::LiveCellRef<ESM::Creature>* ref = mActor.get<ESM::Creature>();
if (ref->mBase->mHasAI)
services = ref->mBase->mAiData.mServices;
}
int windowServices = 0; int windowServices = 0;

2
components/esm/loadnpc.hpp
View file

@ -46,7 +46,7 @@ struct NPC
// Other services // Other services
Spells = 0x00800, Spells = 0x00800,
MagicItems = 0x01000, MagicItems = 0x01000,
Training = 0x04000, // What skills? Training = 0x04000,
Spellmaking = 0x08000, Spellmaking = 0x08000,
Enchanting = 0x10000, Enchanting = 0x10000,
Repair = 0x20000 Repair = 0x20000