Commit 41a958cd authored by scrawl's avatar scrawl

Fix hardcoded beast races in MWClass::Npc::getModel

parent 46d8f3ce
......@@ -183,13 +183,10 @@ namespace MWClass
std::string bodyRaceID = headID.substr(0, end);
std::string model = "meshes\\base_anim.nif";
if (bodyRaceID == "b_n_khajiit_m_" ||
bodyRaceID == "b_n_khajiit_f_" ||
bodyRaceID == "b_n_argonian_m_" ||
bodyRaceID == "b_n_argonian_f_")
{
const ESM::Race* race = MWBase::Environment::get().getWorld()->getStore().get<ESM::Race>().find(ref->mBase->mRace);
if(race->mData.mFlags & ESM::Race::Beast)
model = "meshes\\base_animkna.nif";
}
return model;
}
......
......@@ -233,8 +233,6 @@ namespace MWWorld
mPlayer = new MWWorld::Player (mStore.get<ESM::NPC>().find ("player"), *this);
mRendering->attachCameraTo(mPlayer->getPlayer());
mPhysics->addActor(mPlayer->getPlayer());
// global variables
mGlobalVariables = new Globals (mStore);
......@@ -1315,6 +1313,7 @@ namespace MWWorld
void World::renderPlayer()
{
mRendering->renderPlayer(mPlayer->getPlayer());
mPhysics->addActor(mPlayer->getPlayer());
}
void World::setupExternalRendering (MWRender::ExternalRendering& rendering)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment