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

Don't try to apply body skins for werewolves

Browse source 
They instead use a hidden WerewolfRobe object for their body
This commit is contained in:
Chris Robinson 2013-08-08 04:01:28 -07:00
parent 946ca7f931
commit 1f6055d54b
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
apps/openmw/mwrender/npcanimation.cpp
View file

@ -196,7 +196,8 @@ void NpcAnimation::updateParts(bool forceupdate)
}; };
static const size_t slotlistsize = sizeof(slotlist)/sizeof(slotlist[0]); static const size_t slotlistsize = sizeof(slotlist)/sizeof(slotlist[0]);
MWWorld::InventoryStore &inv = MWWorld::Class::get(mPtr).getInventoryStore(mPtr); const MWWorld::Class &cls = MWWorld::Class::get(mPtr);
MWWorld::InventoryStore &inv = cls.getInventoryStore(mPtr);
for(size_t i = 0;!forceupdate && i < slotlistsize;i++) for(size_t i = 0;!forceupdate && i < slotlistsize;i++)
{ {
MWWorld::ContainerStoreIterator iter = inv.getSlot(slotlist[i].mSlot); MWWorld::ContainerStoreIterator iter = inv.getSlot(slotlist[i].mSlot);
@ -280,18 +281,20 @@ void NpcAnimation::updateParts(bool forceupdate)
showWeapons(mShowWeapons); showWeapons(mShowWeapons);
const int Flag_Female = 0x01; // Remember body parts so we only have to search through the store once for each race/gender/viewmode combination
const int Flag_FirstPerson = 0x02; static std::map< std::pair<std::string,int>,std::vector<const ESM::BodyPart*> > sRaceMapping;
int flags = 0; static const int Flag_Female = 1<<0;
if (!mNpc->isMale()) static const int Flag_FirstPerson = 1<<1;
bool isWerewolf = cls.getNpcStats(mPtr).isWerewolf();
int flags = (isWerewolf ? -1 : 0);
if(!mNpc->isMale())
flags |= Flag_Female; flags |= Flag_Female;
if (mViewMode == VM_FirstPerson) if(mViewMode == VM_FirstPerson)
flags |= Flag_FirstPerson; flags |= Flag_FirstPerson;
// Remember body parts so we only have to search through the store once for each race/gender/viewmode combination std::string race = (isWerewolf ? "werewolf" : Misc::StringUtils::lowerCase(mNpc->mRace));
static std::map< std::pair<std::string, int> , std::vector<const ESM::BodyPart*> > sRaceMapping;
std::string race = Misc::StringUtils::lowerCase(mNpc->mRace);
std::pair<std::string, int> thisCombination = std::make_pair(race, flags); std::pair<std::string, int> thisCombination = std::make_pair(race, flags);
if (sRaceMapping.find(thisCombination) == sRaceMapping.end()) if (sRaceMapping.find(thisCombination) == sRaceMapping.end())
{ {
@ -328,6 +331,8 @@ void NpcAnimation::updateParts(bool forceupdate)
const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>(); const MWWorld::Store<ESM::BodyPart> &partStore = store.get<ESM::BodyPart>();
for(MWWorld::Store<ESM::BodyPart>::iterator it = partStore.begin(); it != partStore.end(); ++it) for(MWWorld::Store<ESM::BodyPart>::iterator it = partStore.begin(); it != partStore.end(); ++it)
{ {
if(isWerewolf)
break;
const ESM::BodyPart& bodypart = *it; const ESM::BodyPart& bodypart = *it;
if (bodypart.mData.mFlags & ESM::BodyPart::BPF_NotPlayable) if (bodypart.mData.mFlags & ESM::BodyPart::BPF_NotPlayable)
continue; continue;