mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 20:06:41 +00:00
Code Issues Releases Wiki Activity

Remove unnecessary mBodyPrefix field

Browse source
This commit is contained in:
Chris Robinson 2013-08-07 16:45:29 -07:00
parent 5051544144
commit f73578a832
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -126,9 +126,6 @@ void NpcAnimation::updateNpcBase()
mHairModel = "meshes\\" + store.get<ESM::BodyPart>().find("WerewolfHair")->mModel; mHairModel = "meshes\\" + store.get<ESM::BodyPart>().find("WerewolfHair")->mModel;
} }
mBodyPrefix = "b_n_" + mNpc->mRace;
Misc::StringUtils::toLower(mBodyPrefix);
bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0; bool isBeast = (race->mData.mFlags & ESM::Race::Beast) != 0;
std::string smodel = (mViewMode != VM_FirstPerson) ? std::string smodel = (mViewMode != VM_FirstPerson) ?
(!isWerewolf ? !isBeast ? "meshes\\base_anim.nif" (!isWerewolf ? !isBeast ? "meshes\\base_anim.nif"
@ -144,7 +141,7 @@ void NpcAnimation::updateNpcBase()
addAnimSource(smodel); addAnimSource(smodel);
if(!isWerewolf) if(!isWerewolf)
{ {
if(mBodyPrefix.find("argonian") != std::string::npos) if(Misc::StringUtils::lowerCase(mNpc->mRace).find("argonian") != std::string::npos)
addAnimSource("meshes\\argonian_swimkna.nif"); addAnimSource("meshes\\argonian_swimkna.nif");
else if(!mNpc->isMale() && !isBeast) else if(!mNpc->isMale() && !isBeast)
addAnimSource("meshes\\base_anim_female.nif"); addAnimSource("meshes\\base_anim_female.nif");

9
apps/openmw/mwrender/npcanimation.hpp
View file

@ -37,11 +37,10 @@ private:
// Bounded Parts // Bounded Parts
NifOgre::ObjectList mObjectParts[ESM::PRT_Count]; NifOgre::ObjectList mObjectParts[ESM::PRT_Count];
const ESM::NPC *mNpc; const ESM::NPC *mNpc;
std::string mHeadModel; std::string mHeadModel;
std::string mHairModel; std::string mHairModel;
std::string mBodyPrefix; ViewMode mViewMode;
ViewMode mViewMode;
bool mShowWeapons; bool mShowWeapons;
float mTimeToChange; float mTimeToChange;